Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=1d313b4551f879d4f4f5e5bd35f30f20889f79e5
commit 1d313b4551f879d4f4f5e5bd35f30f20889f79e5 Author: Michel Hermier <[email protected]> Date: Tue Dec 10 00:34:21 2013 +0100 libpacman: Remove FREESYNC. diff --git a/lib/libpacman/sync.c b/lib/libpacman/sync.c index 2ddafa0..9ea84fc 100644 --- a/lib/libpacman/sync.c +++ b/lib/libpacman/sync.c @@ -412,9 +412,10 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) if(rmpkg) { pmsyncpkg_t *rsync = _pacman_trans_find(trans, rmpkg); pmsyncpkg_t *spkg = NULL; + _pacman_log(PM_LOG_FLOW2, _("removing '%s' from target list"), rmpkg); trans->syncpkgs = _pacman_list_remove(trans->syncpkgs, rsync, _pacman_syncpkg_cmp, (void **)&spkg); - FREESYNC(spkg); + _pacman_syncpkg_delete(spkg); continue; } } @@ -449,9 +450,10 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) if(rsync) { /* remove it from the target list */ pmsyncpkg_t *spkg = NULL; + _pacman_log(PM_LOG_FLOW2, _("removing '%s' from target list"), miss->depend.name); trans->syncpkgs = _pacman_list_remove(trans->syncpkgs, rsync, _pacman_syncpkg_cmp, (void **)&spkg); - FREESYNC(spkg); + _pacman_syncpkg_delete(spkg); } } else { /* abort */ diff --git a/lib/libpacman/sync.h b/lib/libpacman/sync.h index a5b10b8..aecd429 100644 --- a/lib/libpacman/sync.h +++ b/lib/libpacman/sync.h @@ -34,8 +34,6 @@ struct __pmsyncpkg_t { void *data; }; -#define FREESYNC(p) do { if(p) { _pacman_syncpkg_delete(p); p = NULL; } } while(0) - pmsyncpkg_t *_pacman_syncpkg_new(int type, pmpkg_t *spkg, void *data); void _pacman_syncpkg_delete(pmsyncpkg_t *syncpkg); diff --git a/lib/libpacman/trans.c b/lib/libpacman/trans.c index 15d4230..9d0d58f 100644 --- a/lib/libpacman/trans.c +++ b/lib/libpacman/trans.c @@ -128,11 +128,12 @@ void _pacman_trans_fini(pmtrans_t *trans) FREELISTPKGS(trans->packages); #if 0 { - pmlist_t *i; - for(i = trans->syncpkgs; i; i = i->next) { - FREESYNC(i->data); - } - FREELIST(trans->syncpkgs); + FVisitor visitor = { + .fn = _pacman_syncpkg_delete, + .data = NULL, + }; + + f_ptrlist_delete(trans->syncpkgs, &visitor); } #endif FREELIST(trans->skiplist); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
