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

main: free pkg_queue_t entries once they are committed to the depgraph

pull/15/head
William Pitcock 2012-05-06 21:12:16 -05:00
parent be5dddd212
commit c69d6c62eb
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main.c
View File

@ -246,7 +246,7 @@ exit_if_uninstalled(pkg_t *pkg, void *unused)
typedef struct pkg_queue_ { typedef struct pkg_queue_ {
struct pkg_queue_ *prev, *next; struct pkg_queue_ *prev, *next;
const char *package; char *package;
} pkg_queue_t; } pkg_queue_t;
static pkg_queue_t * static pkg_queue_t *
@ -266,7 +266,7 @@ int
pkg_queue_walk(pkg_queue_t *head) pkg_queue_walk(pkg_queue_t *head)
{ {
int wanted_something = 0; int wanted_something = 0;
pkg_queue_t *pkgq; pkg_queue_t *pkgq, *next_pkgq;
pkg_t world = (pkg_t){ pkg_t world = (pkg_t){
.id = "world", .id = "world",
.realname = "virtual", .realname = "virtual",
@ -281,12 +281,15 @@ 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++;
foreach_list_entry(head, pkgq) foreach_list_entry_safe(head, next_pkgq, pkgq)
{ {
pkg_dependency_t *pkgdep; pkg_dependency_t *pkgdep;
pkgdep = parse_deplist(&world, pkgq->package); pkgdep = parse_deplist(&world, pkgq->package);
world.requires = pkg_dependency_append(world.requires, pkgdep); world.requires = pkg_dependency_append(world.requires, pkgdep);
free(pkgq->package);
free(pkgq);
} }
/* we should verify that the graph is complete before attempting to compute cflags etc. */ /* we should verify that the graph is complete before attempting to compute cflags etc. */