Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=d89141fad4729ec5ba2f6a677ecb4f2e92aef96f
commit d89141fad4729ec5ba2f6a677ecb4f2e92aef96f Author: Michel Hermier <[email protected]> Date: Wed Oct 8 10:03:56 2014 +0200 libpacman: Make _pacman_db_get_grpfromcache a method of Database (as find_group). diff --git a/lib/libpacman/cache.h b/lib/libpacman/cache.h index 71c5a74..295244f 100644 --- a/lib/libpacman/cache.h +++ b/lib/libpacman/cache.h @@ -25,9 +25,6 @@ #include "group.h" #include "db.h" -/* groups */ -libpacman::Group *_pacman_db_get_grpfromcache(libpacman::Database *db, const char *target); - #endif /* _PACMAN_CACHE_H */ /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libpacman/database_cache.cpp b/lib/libpacman/database_cache.cpp index 35f7b5b..c799c55 100644 --- a/lib/libpacman/database_cache.cpp +++ b/lib/libpacman/database_cache.cpp @@ -207,11 +207,9 @@ libpacman::group_set &Database::get_groups() return grpcache; } -Group *_pacman_db_get_grpfromcache(Database *db, const char *target) +Group *Database::find_group(const char *target) { - ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, NULL)); - - return _pacman_db_get_grpfromlist(db->get_groups(), target); + return _pacman_db_get_grpfromlist(get_groups(), target); } /* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libpacman/db.h b/lib/libpacman/db.h index a786f70..a7cfc12 100644 --- a/lib/libpacman/db.h +++ b/lib/libpacman/db.h @@ -84,6 +84,7 @@ public: libpacman::Package *find(const char *target, int packagestrmatcher_flags = PM_PACKAGE_FLAG_NAME, int strmatcher_flags = FStrMatcher::EQUAL); + libpacman::Group *find_group(const char *target); libpacman::package_set &get_packages(); libpacman::group_set &get_groups(); FList<libpacman::Package *> whatPackagesProvide(const char *target); diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index db73799..eaa9adb 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -598,7 +598,7 @@ pmgrp_t *pacman_db_readgrp(pmdb_t *_db, char *name) ASSERT(db != NULL, return(NULL)); ASSERT(!_pacman_strempty(name), return(NULL)); - return c_cast(_pacman_db_get_grpfromcache(db, name)); + return c_cast(db->find_group(name)); } /** Get the group cache of a package database _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
