Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=4ce469d3a4c281caa523f96c3759d8b2337c9c67
commit 4ce469d3a4c281caa523f96c3759d8b2337c9c67 Author: Michel Hermier <[email protected]> Date: Wed Oct 8 09:53:51 2014 +0200 libpacman: Make _pacman_db_add_pkgincache a method of Database. diff --git a/lib/libpacman/cache.h b/lib/libpacman/cache.h index 622ae92..5bdff4e 100644 --- a/lib/libpacman/cache.h +++ b/lib/libpacman/cache.h @@ -26,7 +26,6 @@ #include "db.h" /* packages */ -int _pacman_db_add_pkgincache(libpacman::Database *db, libpacman::Package *pkg); int _pacman_db_remove_pkgfromcache(libpacman::Database *db, libpacman::Package *pkg); /* groups */ libpacman::Group *_pacman_db_get_grpfromcache(libpacman::Database *db, const char *target); diff --git a/lib/libpacman/database_cache.cpp b/lib/libpacman/database_cache.cpp index 20a7df2..f93dfdd 100644 --- a/lib/libpacman/database_cache.cpp +++ b/lib/libpacman/database_cache.cpp @@ -101,18 +101,17 @@ libpacman::package_set &Database::get_packages() return pkgcache; } -int _pacman_db_add_pkgincache(Database *db, Package *pkg) +int Database::add_pkgincache(Package *pkg) { - ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); if(pkg == NULL) { return(-1); } pkg->acquire(); // FIXME: Should not be necessary, but required during migration to refcounted object - _pacman_log(PM_LOG_DEBUG, _("adding entry '%s' in '%s' cache"), pkg->name(), db->treename()); - db->pkgcache.add(pkg); + _pacman_log(PM_LOG_DEBUG, _("adding entry '%s' in '%s' cache"), pkg->name(), treename()); + pkgcache.add(pkg); - _pacman_db_clear_grpcache(db); + _pacman_db_clear_grpcache(this); return(0); } diff --git a/lib/libpacman/db.h b/lib/libpacman/db.h index c01be5b..404a8e4 100644 --- a/lib/libpacman/db.h +++ b/lib/libpacman/db.h @@ -71,6 +71,7 @@ public: virtual int write(libpacman::Package *info, unsigned int inforeq); /* Cache operations */ + int add_pkgincache(libpacman::Package *pkg); void free_pkgcache(); FList<libpacman::Package *> filter(const libpacman::PackageMatcher &packagematcher); diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index adb2dbc..8d3687b 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -1756,7 +1756,7 @@ int __pmtrans_t::commit(FPtrList **data) pkg_new->name(), pkg_new->version()); RET_ERR(PM_ERR_DB_WRITE, -1); } - if(_pacman_db_add_pkgincache(db_local, pkg_new) == -1) { + if(db_local->add_pkgincache(pkg_new) == -1) { _pacman_log(PM_LOG_ERROR, _("could not add entry '%s' in cache"), pkg_new->name()); } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
