bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small code cleanups with indents/spaces

Browse source 
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2008-01-01 19:59:27 -06:00
parent 4abd710ec9
commit c18191ba5b
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/libalpm/conflict.c
View file

@ -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) { for(k = tmpfiles; k; k = k->next) {
snprintf(path, PATH_MAX, "%s%s", root, (char *)k->data); snprintf(path, PATH_MAX, "%s%s", root, (char *)k->data);
conflicts = add_fileconflict(conflicts, PM_FILECONFLICT_TARGET, path, 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); 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 */ * is not currently installed, then simply stat the whole filelist */
if(dbpkg) { if(dbpkg) {
/* older ver of package currently installed */ /* 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 { } else {
/* no version of package currently installed */ /* no version of package currently installed */
tmpfiles = alpm_list_strdup(alpm_pkg_get_files(p1)); 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) { if(!resolved_conflict) {
_alpm_log(PM_LOG_DEBUG, "file found in conflict: %s\n", path); _alpm_log(PM_LOG_DEBUG, "file found in conflict: %s\n", path);
conflicts = add_fileconflict(conflicts, PM_FILECONFLICT_FILESYSTEM, conflicts = add_fileconflict(conflicts, PM_FILECONFLICT_FILESYSTEM,
path, p1->name, NULL); path, p1->name, NULL);
} }
} }
} }

6
lib/libalpm/package.c
View file

@ -758,12 +758,12 @@ pmpkg_t *_alpm_pkg_new(const char *name, const char *version)
if(name && name[0] != 0) { if(name && name[0] != 0) {
strncpy(pkg->name, name, PKG_NAME_LEN); strncpy(pkg->name, name, PKG_NAME_LEN);
} else { } else {
pkg->name[0] = '\0'; pkg->name[0] = '\0';
} }
if(version && version[0] != 0) { if(version && version[0] != 0) {
strncpy(pkg->version, version, PKG_VERSION_LEN); strncpy(pkg->version, version, PKG_VERSION_LEN);
} else { } else {
pkg->version[0] = '\0'; pkg->version[0] = '\0';
} }
return(pkg); 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)); CALLOC(newpkg, 1, sizeof(pmpkg_t), RET_ERR(PM_ERR_MEMORY, NULL));
memcpy(newpkg, pkg, sizeof(pmpkg_t)); 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->conflicts = alpm_list_strdup(alpm_pkg_get_conflicts(pkg));
newpkg->files = alpm_list_strdup(alpm_pkg_get_files(pkg)); newpkg->files = alpm_list_strdup(alpm_pkg_get_files(pkg));
newpkg->backup = alpm_list_strdup(alpm_pkg_get_backup(pkg)); newpkg->backup = alpm_list_strdup(alpm_pkg_get_backup(pkg));