Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=72aca9ea489bc4970572decbcdf8724be7d52021
commit 72aca9ea489bc4970572decbcdf8724be7d52021 Author: Michel Hermier <[email protected]> Date: Tue Apr 29 12:03:32 2014 +0200 libpacman: Remove FREEPKG. diff --git a/lib/libpacman/cache.cpp b/lib/libpacman/cache.cpp index d548a78..505d6ac 100644 --- a/lib/libpacman/cache.cpp +++ b/lib/libpacman/cache.cpp @@ -144,7 +144,7 @@ int _pacman_db_remove_pkgfromcache(Database *db, Package *pkg) } _pacman_log(PM_LOG_DEBUG, _("removing entry '%s' from '%s' cache"), pkg->name, db->treename); - FREEPKG(data); + delete data; _pacman_db_clear_grpcache(db); diff --git a/lib/libpacman/db/fakedb.cpp b/lib/libpacman/db/fakedb.cpp index b9735b6..d77dc27 100644 --- a/lib/libpacman/db/fakedb.cpp +++ b/lib/libpacman/db/fakedb.cpp @@ -75,7 +75,7 @@ static Package *_pacman_fakedb_pkg_new(pmdb_t *fakedb, const char *name) } FREE(str); if(dummy->name[0] == 0 || dummy->version[0] == 0) { - FREEPKG(dummy); + delete dummy; RET_ERR(PM_ERR_PKG_INVALID_NAME, NULL); } return dummy; diff --git a/lib/libpacman/db/localdb.cpp b/lib/libpacman/db/localdb.cpp index 767647c..7fdb110 100644 --- a/lib/libpacman/db/localdb.cpp +++ b/lib/libpacman/db/localdb.cpp @@ -130,7 +130,8 @@ Package *_pacman_localdb_pkg_new(Database *db, const struct dirent *dirent, unsi if((pkg = _pacman_pkg_new_from_filename(dname, 0, db)) == NULL || db->read(pkg, inforeq) == -1) { _pacman_log(PM_LOG_ERROR, _("invalid name for dabatase entry '%s'"), dname); - FREEPKG(pkg); + delete pkg; + pkg = NULL; } return pkg; } diff --git a/lib/libpacman/db/syncdb.cpp b/lib/libpacman/db/syncdb.cpp index a5ff77d..bb3bb83 100644 --- a/lib/libpacman/db/syncdb.cpp +++ b/lib/libpacman/db/syncdb.cpp @@ -131,7 +131,8 @@ Package *_pacman_syncdb_pkg_new(Database *db, const struct archive_entry *entry, if((pkg = _pacman_pkg_new_from_filename(dname, 0, db)) == NULL || db->read(pkg, inforeq) == -1) { _pacman_log(PM_LOG_ERROR, _("invalid name for dabatase entry '%s'"), dname); - FREEPKG(pkg); + delete pkg; + pkg = NULL; } return pkg; } diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index ac279af..049acb0 100644 --- a/lib/libpacman/deps.cpp +++ b/lib/libpacman/deps.cpp @@ -651,7 +651,7 @@ int _pacman_resolvedeps(pmtrans_t *trans, Package *syncpkg, pmlist_t *list, if(_pacman_list_is_strin(ps->name, handle->ignorepkg)) { Package *dummypkg = new Package(miss->target, NULL); QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, dummypkg, ps, NULL, &usedep); - FREEPKG(dummypkg); + delete dummypkg; } if(usedep) { trail = _pacman_list_add(trail, ps); diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 5c76c86..216f3f7 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -146,13 +146,6 @@ public: } -#define FREEPKG(p) \ -do { \ - if(p && _pacman_pkg_delete(p) == 0) { \ - p = NULL; \ - } \ -} while(0) - #define FREELISTPKGS(p) _FREELIST(p, _pacman_pkg_delete) libpacman::Package *_pacman_pkg_new_from_filename(const char *filename, int witharch, libpacman::Database *database = 0); diff --git a/lib/libpacman/package/fpmpackage.cpp b/lib/libpacman/package/fpmpackage.cpp index 5f5aed5..ef5c2c5 100644 --- a/lib/libpacman/package/fpmpackage.cpp +++ b/lib/libpacman/package/fpmpackage.cpp @@ -247,7 +247,7 @@ Package *_pacman_fpmpackage_load(const char *pkgfile) return(info); error: - FREEPKG(info); + delete info; if(!ret) { archive_read_finish (archive); } diff --git a/lib/libpacman/sync.cpp b/lib/libpacman/sync.cpp index ca7f564..52c351b 100644 --- a/lib/libpacman/sync.cpp +++ b/lib/libpacman/sync.cpp @@ -84,7 +84,7 @@ int _pacman_syncpkg_delete(pmsyncpkg_t *ps) if(ps->type == PM_SYNC_TYPE_REPLACE) { FREELISTPKGS(ps->data); } else { - FREEPKG(ps->data); + delete (Package *)ps->data; } free(ps); return 0; @@ -195,7 +195,7 @@ int _pacman_sync_addtarget(pmtrans_t *trans, const char *name) } ps = _pacman_syncpkg_new(PM_SYNC_TYPE_UPGRADE, spkg, dummy); if(ps == NULL) { - FREEPKG(dummy); + delete dummy; RET_ERR(PM_ERR_MEMORY, -1); } _pacman_trans_add(trans, ps, 0); @@ -443,7 +443,8 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) if(ps->type != PM_SYNC_TYPE_REPLACE) { /* switch this sync type to REPLACE */ ps->type = PM_SYNC_TYPE_REPLACE; - FREEPKG(ps->data); + delete ps->data; + ps->data = NULL; } /* append to the replaces list */ _pacman_log(PM_LOG_FLOW2, _("electing '%s' for removal"), miss->depend.name); diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 070afdb..e427997 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -429,7 +429,7 @@ int _pacman_trans_addtarget(pmtrans_t *trans, const char *target) _pacman_log(PM_LOG_WARNING, _("newer version %s-%s is in the target list -- skipping"), pkg_queued->name, pkg_queued->version, pkg_new->version); } - FREEPKG(pkg_new); + delete pkg_new; } else { _pacman_trans_add_package(trans, pkg_new, trans->type, 0); } @@ -446,7 +446,7 @@ int _pacman_trans_addtarget(pmtrans_t *trans, const char *target) return(0); error: - FREEPKG(pkg_new); + delete pkg_new; return(-1); } @@ -1242,7 +1242,7 @@ int _pacman_add_commit(pmtrans_t *trans, pmlist_t **data) EVENT(trans, (pmo_upgrade) ? PM_TRANS_EVT_UPGRADE_DONE : PM_TRANS_EVT_ADD_DONE, pkg_new, oldpkg); - FREEPKG(oldpkg); + delete oldpkg; } /* run ldconfig if it exists */ diff --git a/lib/libpacman/trans_sysupgrade.cpp b/lib/libpacman/trans_sysupgrade.cpp index 51fe478..9a1ac7b 100644 --- a/lib/libpacman/trans_sysupgrade.cpp +++ b/lib/libpacman/trans_sysupgrade.cpp @@ -122,7 +122,7 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) /* none found -- enter pkg into the final sync list */ ps = _pacman_syncpkg_new(PM_SYNC_TYPE_REPLACE, spkg, NULL); if(ps == NULL) { - FREEPKG(dummy); + delete dummy; pm_errno = PM_ERR_MEMORY; goto error; } @@ -202,7 +202,7 @@ int _pacman_trans_sysupgrade(pmtrans_t *trans) } ps = _pacman_syncpkg_new(PM_SYNC_TYPE_UPGRADE, spkg, dummy); if(ps == NULL) { - FREEPKG(dummy); + delete dummy; goto error; } trans->syncpkgs = _pacman_list_add(trans->syncpkgs, ps); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
