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

libalpm: use FREELIST when possible

Browse source 
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2007-11-16 21:15:49 -06:00
parent 2322909703
commit cfcc550e2a
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/libalpm/add.c
View file

@ -295,8 +295,7 @@ static int upgrade_remove(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans, pm
tr = NULL; tr = NULL;
/* restore our "NoUpgrade" list to previous state */ /* restore our "NoUpgrade" list to previous state */
alpm_list_free_inner(handle->noupgrade, free); FREELIST(handle->noupgrade);
alpm_list_free(handle->noupgrade);
handle->noupgrade = old_noupgrade; handle->noupgrade = old_noupgrade;
if(ret == -1) { if(ret == -1) {

6
lib/libalpm/conflict.c
View file

@ -307,8 +307,7 @@ alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root)
conflicts = add_fileconflict(conflicts, PM_CONFLICT_TYPE_TARGET, path, conflicts = add_fileconflict(conflicts, PM_CONFLICT_TYPE_TARGET, path,
alpm_pkg_get_name(p1), alpm_pkg_get_name(p2)); alpm_pkg_get_name(p1), alpm_pkg_get_name(p2));
} }
alpm_list_free_inner(tmpfiles, &free); FREELIST(tmpfiles);
alpm_list_free(tmpfiles);
} }
} }
@ -413,8 +412,7 @@ alpm_list_t *_alpm_db_find_conflicts(pmdb_t *db, pmtrans_t *trans, char *root)
} }
} }
} }
alpm_list_free_inner(tmpfiles, &free); FREELIST(tmpfiles);
alpm_list_free(tmpfiles);
} }
return(conflicts); return(conflicts);

3
lib/libalpm/package.c
View file

@ -1022,8 +1022,7 @@ pmpkg_t *_alpm_pkg_load(const char *pkgfile, unsigned short full)
_alpm_log(PM_LOG_ERROR, _("missing package filelist in %s, generating one\n"), pkgfile); _alpm_log(PM_LOG_ERROR, _("missing package filelist in %s, generating one\n"), pkgfile);
info->files = all_files; info->files = all_files;
} else { } else {
alpm_list_free_inner(all_files, free); FREELIST(all_files);
alpm_list_free(all_files);
} }
/* this is IMPORTANT - "checking for conflicts" requires a sorted list, so we /* this is IMPORTANT - "checking for conflicts" requires a sorted list, so we