summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-01-01 19:59:27 -0600
committerDan McGee <dan@archlinux.org>2008-01-01 20:03:24 -0600
commitc18191ba5b54439b8e7f64ef8aff0bb37f4b0a8a (patch)
tree3b8900f2010d4cc9f7d883042fcbed6bef977992
parent4abd710ec993bf5766fdbf2f1cf240a8d6e7d17f (diff)
downloadpacman-c18191ba5b54439b8e7f64ef8aff0bb37f4b0a8a.tar.xz
Small code cleanups with indents/spaces
Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/conflict.c7
-rw-r--r--lib/libalpm/package.c6
2 files changed, 7 insertions, 6 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);
}
}
}
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c
index 49e562e7..657de7da 100644
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -758,12 +758,12 @@ pmpkg_t *_alpm_pkg_new(const char *name, const char *version)
if(name && name[0] != 0) {
strncpy(pkg->name, name, PKG_NAME_LEN);
} else {
- pkg->name[0] = '\0';
+ pkg->name[0] = '\0';
}
if(version && version[0] != 0) {
strncpy(pkg->version, version, PKG_VERSION_LEN);
} else {
- pkg->version[0] = '\0';
+ pkg->version[0] = '\0';
}
return(pkg);
@@ -778,7 +778,7 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg)
CALLOC(newpkg, 1, sizeof(pmpkg_t), RET_ERR(PM_ERR_MEMORY, NULL));
memcpy(newpkg, pkg, sizeof(pmpkg_t));
- newpkg->licenses = alpm_list_strdup(alpm_pkg_get_licenses(pkg));
+ newpkg->licenses = alpm_list_strdup(alpm_pkg_get_licenses(pkg));
newpkg->conflicts = alpm_list_strdup(alpm_pkg_get_conflicts(pkg));
newpkg->files = alpm_list_strdup(alpm_pkg_get_files(pkg));
newpkg->backup = alpm_list_strdup(alpm_pkg_get_backup(pkg));