Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=c5682a6981e829cde912cad0b34a0e4f52224749
commit c5682a6981e829cde912cad0b34a0e4f52224749 Author: Michel Hermier <[email protected]> Date: Wed May 14 13:09:14 2014 +0200 libpacman: Use Package::release where possible (that don't make tests crash). diff --git a/lib/libpacman/db/fakedb.cpp b/lib/libpacman/db/fakedb.cpp index b369594..e1a9bbf 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->m_name[0] == 0 || dummy->m_version[0] == 0) { - delete dummy; + dummy->release(); 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 ad9f3d0..229b8f2 100644 --- a/lib/libpacman/db/localdb.cpp +++ b/lib/libpacman/db/localdb.cpp @@ -155,7 +155,7 @@ LocalPackage *_pacman_localdb_pkg_new(LocalDatabase *db, const struct dirent *di !pkg->set_filename(dname, 0) || pkg->read(inforeq) == -1) { _pacman_log(PM_LOG_ERROR, _("invalid name for dabatase entry '%s'"), dname); - delete pkg; + pkg->release(); pkg = NULL; } return pkg; diff --git a/lib/libpacman/db/syncdb.cpp b/lib/libpacman/db/syncdb.cpp index 43c71cc..3b6b481 100644 --- a/lib/libpacman/db/syncdb.cpp +++ b/lib/libpacman/db/syncdb.cpp @@ -143,7 +143,7 @@ SyncPackage *_pacman_syncdb_pkg_new(SyncDatabase *db, const struct archive_entry !pkg->set_filename(dname, 0) || pkg->read(inforeq) == -1) { _pacman_log(PM_LOG_ERROR, _("invalid name for dabatase entry '%s'"), dname); - delete pkg; + pkg->release(); pkg = NULL; } return pkg; diff --git a/lib/libpacman/deps.cpp b/lib/libpacman/deps.cpp index 7994db9..1ccd160 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); - delete dummypkg; + dummypkg->release(); } if(usedep) { trail = _pacman_list_add(trail, ps); diff --git a/lib/libpacman/package/fpmpackage.cpp b/lib/libpacman/package/fpmpackage.cpp index 1242d28..c379665 100644 --- a/lib/libpacman/package/fpmpackage.cpp +++ b/lib/libpacman/package/fpmpackage.cpp @@ -248,7 +248,7 @@ Package *_pacman_fpmpackage_load(const char *pkgfile) return(info); error: - delete info; + info->release(); if(!ret) { archive_read_finish (archive); } diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index b1fe211..deb0bf0 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -938,7 +938,7 @@ int pacman_pkg_free(pmpkg_t *_pkg) /* Only free packages loaded in user space */ if(pkg->origin != PKG_FROM_CACHE) { - delete pkg; + pkg->release(); } return(0); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
