ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

main: use pkg_queue_compile() and pkg_queue_free().

pull/36/head
William Pitcock 2012-07-29 04:05:53 -05:00
parent cdac22fc5c
commit 50c496b7ce
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main.c
View File

@ -228,7 +228,6 @@ pkg_queue_walk(pkg_queue_t *head)
{ {
int retval = EXIT_SUCCESS; int retval = EXIT_SUCCESS;
int wanted_something = 0; int wanted_something = 0;
pkg_queue_t *pkgq, *next_pkgq;
pkg_t world = (pkg_t){ pkg_t world = (pkg_t){
.id = "world", .id = "world",
.realname = "virtual", .realname = "virtual",
@ -243,18 +242,10 @@ pkg_queue_walk(pkg_queue_t *head)
else if (maximum_traverse_depth > 0) else if (maximum_traverse_depth > 0)
maximum_traverse_depth++; maximum_traverse_depth++;
PKG_FOREACH_LIST_ENTRY_SAFE(head, next_pkgq, pkgq) if (!pkg_queue_compile(&world, head))
{ {
pkg_dependency_t *pkgdep; retval = EXIT_FAILURE;
goto out;
pkgdep = pkg_dependency_parse(&world, pkgq->package);
if (pkgdep != NULL)
world.requires = pkg_dependency_append(world.requires, pkgdep);
else
retval = EXIT_FAILURE;
free(pkgq->package);
free(pkgq);
} }
/* we couldn't build the entire depgraph, so bail. */ /* we couldn't build the entire depgraph, so bail. */
@ -759,6 +750,7 @@ main(int argc, char *argv[])
} }
ret = pkg_queue_walk(pkgq_head); ret = pkg_queue_walk(pkgq_head);
pkg_queue_free(pkgq_head);
pkg_tuple_free_global(); pkg_tuple_free_global();
return ret; return ret;