moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-10 13:28:12 -05:00
Code Issues Releases Wiki Activity

small sync.c code clean-up

Browse Source 
Remove unnecessary synclist_free function, and use our standard way
(alpm_list_free_inner + alpm_list_free) instead.
This slightly reduces code duplication.

Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Nagy Gabor 2008-01-14 14:29:41 +01:00 committed by Dan McGee
parent 88cbee3c24
commit f432ce41e0
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/libalpm/sync.c
View File

@ -78,20 +78,6 @@ void _alpm_sync_free(pmsyncpkg_t *sync)
FREE(sync); FREE(sync);
} }
static void synclist_free(alpm_list_t *syncpkgs)
{
if(syncpkgs) {
alpm_list_t *tmp;
for(tmp = syncpkgs; tmp; tmp = alpm_list_next(tmp)) {
if(tmp->data) {
_alpm_sync_free(tmp->data);
}
}
alpm_list_free(syncpkgs);
}
}
/* Find recommended replacements for packages during a sync. /* Find recommended replacements for packages during a sync.
*/ */
static int find_replacements(pmtrans_t *trans, pmdb_t *db_local, static int find_replacements(pmtrans_t *trans, pmdb_t *db_local,
@ -154,7 +140,9 @@ static int find_replacements(pmtrans_t *trans, pmdb_t *db_local,
sync = _alpm_sync_new(PM_SYNC_TYPE_REPLACE, spkg, NULL); sync = _alpm_sync_new(PM_SYNC_TYPE_REPLACE, spkg, NULL);
if(sync == NULL) { if(sync == NULL) {
pm_errno = PM_ERR_MEMORY; pm_errno = PM_ERR_MEMORY;
synclist_free(*syncpkgs); alpm_list_free_inner(*syncpkgs, (alpm_list_fn_free)_alpm_sync_free);
alpm_list_free(*syncpkgs);
*syncpkgs = NULL;
return(-1); return(-1);
} }
sync->data = alpm_list_add(NULL, lpkg); sync->data = alpm_list_add(NULL, lpkg);
@ -244,7 +232,9 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans,
sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, local); sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, local);
if(sync == NULL) { if(sync == NULL) {
pm_errno = PM_ERR_MEMORY; pm_errno = PM_ERR_MEMORY;
synclist_free(*syncpkgs); alpm_list_free_inner(*syncpkgs, (alpm_list_fn_free)_alpm_sync_free);
alpm_list_free(*syncpkgs);
*syncpkgs = NULL;
return(-1); return(-1);
} }
*syncpkgs = alpm_list_add(*syncpkgs, sync); *syncpkgs = alpm_list_add(*syncpkgs, sync);