diff options
| author | Dan McGee <dan@archlinux.org> | 2008-01-02 02:59:27 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-01-02 03:03:24 +0100 |
| commit | c18191ba5b54439b8e7f64ef8aff0bb37f4b0a8a (patch) | |
| tree | 3b8900f2010d4cc9f7d883042fcbed6bef977992 /lib/libalpm/conflict.c | |
| parent | 4abd710ec993bf5766fdbf2f1cf240a8d6e7d17f (diff) | |
| download | pacman-c18191ba5b54439b8e7f64ef8aff0bb37f4b0a8a.tar.gz pacman-c18191ba5b54439b8e7f64ef8aff0bb37f4b0a8a.tar.xz | |
Small code cleanups with indents/spaces
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/conflict.c')
| -rw-r--r-- | lib/libalpm/conflict.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 5c53b961..38ab9724 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -358,7 +358,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *roo for(k = tmpfiles; k; k = k->next) { snprintf(path, PATH_MAX, "%s%s", root, (char *)k->data); conflicts = add_fileconflict(conflicts, PM_FILECONFLICT_TARGET, path, - alpm_pkg_get_name(p1), alpm_pkg_get_name(p2)); + alpm_pkg_get_name(p1), alpm_pkg_get_name(p2)); } FREELIST(tmpfiles); } @@ -377,7 +377,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *roo * is not currently installed, then simply stat the whole filelist */ if(dbpkg) { /* older ver of package currently installed */ - tmpfiles = chk_filedifference(alpm_pkg_get_files(p1), alpm_pkg_get_files(dbpkg)); + tmpfiles = chk_filedifference(alpm_pkg_get_files(p1), + alpm_pkg_get_files(dbpkg)); } else { /* no version of package currently installed */ tmpfiles = alpm_list_strdup(alpm_pkg_get_files(p1)); @@ -461,7 +462,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, char *roo if(!resolved_conflict) { _alpm_log(PM_LOG_DEBUG, "file found in conflict: %s\n", path); conflicts = add_fileconflict(conflicts, PM_FILECONFLICT_FILESYSTEM, - path, p1->name, NULL); + path, p1->name, NULL); } } } |