Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=98e9f2fe73a9c5ba45ad65b3f56c6005ea9c8b43
commit 98e9f2fe73a9c5ba45ad65b3f56c6005ea9c8b43 Author: Michel Hermier <[email protected]> Date: Thu May 8 15:08:37 2014 +0200 libpacman: Remove _pacman_pkg_delete. diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index f55cdd4..6577a46 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) { - _pacman_pkg_delete(pkg); + delete pkg; } return(0); diff --git a/lib/libpacman/sync.cpp b/lib/libpacman/sync.cpp index f4f8d37..382cdea 100644 --- a/lib/libpacman/sync.cpp +++ b/lib/libpacman/sync.cpp @@ -80,12 +80,6 @@ __pmsyncpkg_t::~__pmsyncpkg_t() } } -int _pacman_syncpkg_delete(pmsyncpkg_t *ps) -{ - delete ps; - return 0; -} - /* Helper functions for _pacman_list_remove */ static @@ -412,7 +406,7 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) _pacman_log(PM_LOG_FLOW2, _("removing '%s' from target list"), rmpkg); trans->syncpkgs = _pacman_list_remove(trans->syncpkgs, rsync, _pacman_syncpkg_cmp, (void **)&spkg); - _pacman_syncpkg_delete(spkg); + delete spkg; continue; } } @@ -451,7 +445,7 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) _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); - _pacman_syncpkg_delete(spkg); + delete spkg; } } else { /* abort */ diff --git a/lib/libpacman/sync.h b/lib/libpacman/sync.h index 16e8026..1e98ab8 100644 --- a/lib/libpacman/sync.h +++ b/lib/libpacman/sync.h @@ -40,8 +40,6 @@ struct __pmsyncpkg_t libpacman::Package *pkg_local; }; -int _pacman_syncpkg_delete(pmsyncpkg_t *syncpkg); - extern const pmtrans_ops_t _pacman_sync_pmtrans_opts; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
