From 170d63190a3cfb0c12ee9ddfe07b21f20825bd6f Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Wed, 24 Jan 2007 08:51:50 +0000 Subject: * Shuffled some of the alpm_list free funtions - still not perfect, but better * Added alpm_list_remove_node for single list node removal * Proper error checking/output for failed db_read/db_write (missing files) * Invalid packages (missing files) are now removed from the package cache * -Qs and -Ss output now look the same * config.rpath causes errors on one machine I had, so I added it to CVS * Fixed a "clobbered memory" issue when installing groups - only the outer list should be free'd, not the contained data --- src/pacman/sync.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/pacman/sync.c') diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 6288ac50..6b1cb432 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -265,7 +265,7 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) indentprint(alpm_pkg_get_desc(pkg), 4); printf("\n\n"); } - alpm_list_free_outer(ret); + alpm_list_free(ret); } else { for(j = alpm_db_getpkgcache(db); j; j = alpm_list_next(j)) { pmpkg_t *pkg = alpm_list_getdata(j); @@ -375,7 +375,7 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) if(db == NULL) { ERR(NL, _("repository \"%s\" was not found.\n"),repo); - FREELISTPTR(ls); + alpm_list_free(ls); return(1); } @@ -395,7 +395,7 @@ static int sync_list(alpm_list_t *syncs, alpm_list_t *targets) } if(targets) { - FREELISTPTR(ls); + alpm_list_free(ls); } return(0); @@ -541,7 +541,7 @@ int pacman_sync(alpm_list_t *targets) } } } - FREELIST(pkgs); + alpm_list_free(pkgs); } } if(!found) { @@ -756,8 +756,7 @@ int pacman_sync(alpm_list_t *targets) */ cleanup: if(data) { - alpm_list_free(data, NULL); - data = NULL; + alpm_list_free(data); } if(alpm_trans_release() == -1) { ERR(NL, _("failed to release transaction (%s)\n"), alpm_strerror(pm_errno)); -- cgit v1.2.3