Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=dc1b98f32e86c204671d20160b254b850a898a0d
commit dc1b98f32e86c204671d20160b254b850a898a0d Author: Michel Hermier <[email protected]> Date: Mon May 6 08:06:52 2013 +0200 libpacman: Make _pacman_resolvedeps static. diff --git a/lib/libpacman/deps.c b/lib/libpacman/deps.c index 0eb09c5..58bb939 100644 --- a/lib/libpacman/deps.c +++ b/lib/libpacman/deps.c @@ -553,16 +553,13 @@ void _pacman_removedeps(pmtrans_t *trans) /* populates *trans with packages that need to be installed to satisfy all * dependencies (recursive) for syncpkg */ -int _pacman_resolvedeps(pmtrans_t *trans, pmpkg_t *syncpkg, pmlist_t **data) +static +int _pacman_resolvedeps (pmtrans_t *trans, pmpkg_t *syncpkg, pmlist_t **data) { pmlist_t *i, *j; pmlist_t *targ; pmlist_t *deps = NULL; - if(trans == NULL || syncpkg == NULL) { - return(-1); - } - targ = _pacman_list_add(NULL, syncpkg); deps = _pacman_checkdeps(trans, PM_TRANS_TYPE_ADD, targ); FREELISTPTR(targ); @@ -667,6 +664,10 @@ error: int _pacman_trans_resolvedeps(pmtrans_t *trans, pmlist_t **data) { pmlist_t *i; + if (trans == NULL) { + return(-1); + } + _pacman_log(PM_LOG_FLOW1, _("resolving targets dependencies")); for(i = trans->packages; i; i = i->next) { pmpkg_t *pkg = ((pmtranspkg_t *)i->data)->pkg_new; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
