Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=eaa99e09c3f3062ebb6fc7943ef6e62135a8cdb8
commit eaa99e09c3f3062ebb6fc7943ef6e62135a8cdb8 Author: Michel Hermier <herm...@frugalware.org> Date: Mon Nov 18 15:32:16 2013 +0100 libpacman: Use _pacman_db_get_pkgcache instead of inlined code in _pacman_db_load_grpcache. diff --git a/lib/libpacman/cache.c b/lib/libpacman/cache.c index 5b044f1..55cf3e2 100644 --- a/lib/libpacman/cache.c +++ b/lib/libpacman/cache.c @@ -93,7 +93,7 @@ pmlist_t *_pacman_db_get_pkgcache(pmdb_t *db) { ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, NULL)); - if(db->pkgcache == NULL) { + if(f_ptrlist_empty(db->pkgcache)) { _pacman_db_load_pkgcache(db); } @@ -185,13 +185,11 @@ int _pacman_db_load_grpcache(pmdb_t *db) ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); - if(_pacman_list_empty(db->pkgcache)) { - _pacman_db_load_pkgcache(db); - } + lp = _pacman_db_get_pkgcache(db); _pacman_log(PM_LOG_DEBUG, _("loading group cache for repository '%s'"), db->treename); - for(lp = db->pkgcache; lp; lp = lp->next) { + for(; lp; lp = lp->next) { pmlist_t *i; pmpkg_t *pkg = lp->data; _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git