Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=2958429c9c12a684e9a0a0b3d44efb30eb0b0e0d
commit 2958429c9c12a684e9a0a0b3d44efb30eb0b0e0d Author: Michel Hermier <[email protected]> Date: Wed Nov 20 21:24:31 2013 +0100 libpacman: Some list checkings and ASSERT additions. diff --git a/lib/libpacman/cache.c b/lib/libpacman/cache.c index 55cf3e2..d8dc384 100644 --- a/lib/libpacman/cache.c +++ b/lib/libpacman/cache.c @@ -75,7 +75,7 @@ int _pacman_db_load_pkgcache(pmdb_t *db) void _pacman_db_free_pkgcache(pmdb_t *db) { ASSERT(db != NULL, pm_errno = PM_ERR_DB_NULL; return); - if(db->pkgcache == NULL) { + if(f_ptrlist_empty(db->pkgcache)) { return; } @@ -84,9 +84,7 @@ void _pacman_db_free_pkgcache(pmdb_t *db) FREELISTPKGS(db->pkgcache); - if(db->grpcache) { - _pacman_db_free_grpcache(db); - } + _pacman_db_free_grpcache(db); } pmlist_t *_pacman_db_get_pkgcache(pmdb_t *db) @@ -227,7 +225,8 @@ void _pacman_db_free_grpcache(pmdb_t *db) { pmlist_t *lg; - if(db == NULL || db->grpcache == NULL) { + ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); + if(f_ptrlist_empty(db->grpcache)) { return; } @@ -242,9 +241,7 @@ void _pacman_db_free_grpcache(pmdb_t *db) pmlist_t *_pacman_db_get_grpcache(pmdb_t *db) { - if(db == NULL) { - return(NULL); - } + ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, NULL)); if(db->grpcache == NULL) { _pacman_db_load_grpcache(db); @@ -257,7 +254,8 @@ pmgrp_t *_pacman_db_get_grpfromcache(pmdb_t *db, const char *target) { pmlist_t *i; - if(db == NULL || _pacman_strempty(target)) { + ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, NULL)); + if(_pacman_strempty(target)) { return(NULL); } diff --git a/lib/libpacman/sync.c b/lib/libpacman/sync.c index 27e3962..1fb6259 100644 --- a/lib/libpacman/sync.c +++ b/lib/libpacman/sync.c @@ -313,10 +313,9 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) _pacman_log(PM_LOG_FLOW1, _("looking for unresolvable dependencies")); deps = _pacman_checkdeps(trans, PM_TRANS_TYPE_UPGRADE, list); - if(deps) { + if(!f_ptrlist_empty(deps)) { if(data) { *data = deps; - deps = NULL; } pm_errno = PM_ERR_UNSATISFIED_DEPS; ret = -1; @@ -332,7 +331,7 @@ int _pacman_sync_prepare(pmtrans_t *trans, pmlist_t **data) _pacman_log(PM_LOG_FLOW1, _("looking for conflicts")); deps = _pacman_checkconflicts(trans, list); - if(deps) { + if(!f_ptrlist_empty(deps)) { int errorout = 0; for(i = deps; i && !errorout; i = i->next) { _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
