jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

install.c: avoid using extra pointers when you only need one.

Browse source 
--HG--
extra : convert_revision : 0b8bfe3403b9753be7cc3e0603aeb8f353418f93
This commit is contained in:
Juan RP 2009-02-28 17:22:05 +01:00
parent 7f8077e713
commit 905a6a38ad
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/install.c
View file

@ -111,8 +111,6 @@ install_binpkg_repo_cb(prop_object_t obj, void *arg, bool *cbloop_done)
{ {
prop_dictionary_t repod, pkgrd; prop_dictionary_t repod, pkgrd;
struct cbargs *cb = arg; struct cbargs *cb = arg;
const char *pkgname = cb->pkgname;
const char *destdir = cb->destdir;
char *plist; char *plist;
int rv = 0; int rv = 0;
@ -131,7 +129,7 @@ install_binpkg_repo_cb(prop_object_t obj, void *arg, bool *cbloop_done)
* Get the package dictionary from current repository. * Get the package dictionary from current repository.
* If it's not there, pass to the next repository. * If it's not there, pass to the next repository.
*/ */
pkgrd = xbps_find_pkg_in_dict(repod, "packages", pkgname); pkgrd = xbps_find_pkg_in_dict(repod, "packages", cb->pkgname);
if (pkgrd == NULL) { if (pkgrd == NULL) {
prop_object_release(repod); prop_object_release(repod);
errno = EAGAIN; errno = EAGAIN;
@ -147,8 +145,8 @@ install_binpkg_repo_cb(prop_object_t obj, void *arg, bool *cbloop_done)
*/ */
if (!xbps_pkg_has_rundeps(pkgrd)) { if (!xbps_pkg_has_rundeps(pkgrd)) {
/* pkg has no deps, just install it. */ /* pkg has no deps, just install it. */
rv = xbps_install_binary_pkg_fini(repod, pkgrd, destdir, rv = xbps_install_binary_pkg_fini(repod, pkgrd,
cb->flags); cb->destdir, cb->flags);
prop_object_release(repod); prop_object_release(repod);
return rv; return rv;
} }
@ -168,9 +166,10 @@ install_binpkg_repo_cb(prop_object_t obj, void *arg, bool *cbloop_done)
/* /*
* Install all required dependencies and the package itself. * Install all required dependencies and the package itself.
*/ */
if ((rv = xbps_install_pkg_deps(pkgname, destdir, cb->flags)) == 0) { rv = xbps_install_pkg_deps(cb->pkgname, cb->destdir, cb->flags);
rv = xbps_install_binary_pkg_fini(repod, pkgrd, destdir, if (rv == 0) {
cb->flags); rv = xbps_install_binary_pkg_fini(repod, pkgrd,
cb->destdir, cb->flags);
if (rv == 0) if (rv == 0)
*cbloop_done = true; *cbloop_done = true;
} }