emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps_find_pkg_orphans: simplify even more.

Browse Source
This commit is contained in:
Juan RP 2011-01-29 18:34:50 +01:00
parent 5bbbb3c8fd
commit de034c28f5
1 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/package_orphans.c
View File

@ -64,17 +64,18 @@ static int
find_orphan_pkg(prop_object_t obj, void *arg, bool *loop_done) find_orphan_pkg(prop_object_t obj, void *arg, bool *loop_done)
{ {
prop_array_t reqby, orphans = arg; prop_array_t reqby, orphans = arg;
prop_object_t obj2, obj3; prop_object_t obj2;
prop_object_iterator_t iter, iter2; prop_object_iterator_t iter;
const char *orphan_pkgname; const char *pkgdep;
char *pkgname;
unsigned int ndep = 0, cnt = 0; unsigned int ndep = 0, cnt = 0;
bool automatic = false; bool automatic = false;
pkg_state_t state = 0;
int rv = 0; int rv = 0;
pkg_state_t state;
(void)loop_done; (void)loop_done;
/*
* Skip packages that were not installed automatically.
*/
prop_dictionary_get_bool(obj, "automatic-install", &automatic); prop_dictionary_get_bool(obj, "automatic-install", &automatic);
if (!automatic) if (!automatic)
return 0; return 0;
@ -82,6 +83,9 @@ find_orphan_pkg(prop_object_t obj, void *arg, bool *loop_done)
if ((rv = xbps_get_pkg_state_dictionary(obj, &state)) != 0) if ((rv = xbps_get_pkg_state_dictionary(obj, &state)) != 0)
return rv; return rv;
/*
* Skip packages that aren't fully installed.
*/
if (state != XBPS_PKG_STATE_INSTALLED) if (state != XBPS_PKG_STATE_INSTALLED)
return 0; return 0;
@ -93,34 +97,18 @@ find_orphan_pkg(prop_object_t obj, void *arg, bool *loop_done)
prop_array_add(orphans, obj); prop_array_add(orphans, obj);
return 0; return 0;
} }
iter = prop_array_iterator(reqby); iter = prop_array_iterator(reqby);
if (iter == NULL) if (iter == NULL)
return ENOMEM; return ENOMEM;
while ((obj2 = prop_object_iterator_next(iter)) != NULL) { while ((obj2 = prop_object_iterator_next(iter)) != NULL) {
pkgname = xbps_get_pkg_name(prop_string_cstring_nocopy(obj2)); pkgdep = prop_string_cstring_nocopy(obj2);
if (pkgname == NULL) { if (pkgdep == NULL) {
prop_object_iterator_release(iter); prop_object_iterator_release(iter);
return EINVAL; return EINVAL;
} }
if (xbps_find_pkg_in_array_by_pattern(orphans, pkgdep))
iter2 = prop_array_iterator(orphans);
if (iter == NULL) {
free(pkgname);
prop_object_iterator_release(iter);
return ENOMEM;
}
while ((obj3 = prop_object_iterator_next(iter2)) != NULL) {
prop_dictionary_get_cstring_nocopy(obj3,
"pkgname", &orphan_pkgname);
if (strcmp(orphan_pkgname, pkgname) == 0) {
ndep++; ndep++;
break;
}
}
prop_object_iterator_release(iter2);
free(pkgname);
} }
prop_object_iterator_release(iter); prop_object_iterator_release(iter);
@ -135,7 +123,7 @@ find_orphan_pkg(prop_object_t obj, void *arg, bool *loop_done)
prop_array_t prop_array_t
xbps_find_pkg_orphans(void) xbps_find_pkg_orphans(void)
{ {
prop_array_t array; prop_array_t array = NULL;
prop_dictionary_t dict; prop_dictionary_t dict;
int rv = 0; int rv = 0;
@ -145,8 +133,7 @@ xbps_find_pkg_orphans(void)
* Prepare an array with all packages previously found. * Prepare an array with all packages previously found.
*/ */
if ((array = prop_array_create()) == NULL) if ((array = prop_array_create()) == NULL)
return NULL; goto out;
/* /*
* Find out all orphans by looking at the * Find out all orphans by looking at the
* regpkgdb dictionary and iterate in reverse order * regpkgdb dictionary and iterate in reverse order
@ -157,8 +144,9 @@ xbps_find_pkg_orphans(void)
if (rv != 0) { if (rv != 0) {
errno = rv; errno = rv;
prop_object_release(array); prop_object_release(array);
return NULL; array = NULL;
} }
out:
xbps_regpkgdb_dictionary_release(); xbps_regpkgdb_dictionary_release();
return array; return array;