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

queue: when collecting dependents don't iterate private twice 

Currently, the private field is iterated collecting private deps and
normal deps. It should only be iterated when collecting private deps.
Dylan Baker 2022-08-03 16:40:04 -07:00
parent 7c671b155d
commit f083d8d448
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libpkgconf/queue.c
View File

@ -116,22 +116,27 @@ pkgconf_queue_collect_dependents(pkgconf_client_t *client, pkgconf_pkg_t *pkg, v
if (pkg == world)
return;
PKGCONF_FOREACH_LIST_ENTRY(pkg->required.head, node)
if (!(pkg->flags & PKGCONF_PKG_PKGF_SEARCH_PRIVATE))
{
pkgconf_dependency_t *flattened_dep;
PKGCONF_FOREACH_LIST_ENTRY(pkg->required.head, node)
{
pkgconf_dependency_t *flattened_dep;
flattened_dep = pkgconf_dependency_copy(client, node->data);
flattened_dep = pkgconf_dependency_copy(client, node->data);
pkgconf_node_insert(&flattened_dep->iter, flattened_dep, &world->required);
pkgconf_node_insert(&flattened_dep->iter, flattened_dep, &world->required);
}
}
PKGCONF_FOREACH_LIST_ENTRY(pkg->requires_private.head, node)
else
{
pkgconf_dependency_t *flattened_dep;
PKGCONF_FOREACH_LIST_ENTRY(pkg->requires_private.head, node)
{
pkgconf_dependency_t *flattened_dep;
flattened_dep = pkgconf_dependency_copy(client, node->data);
flattened_dep = pkgconf_dependency_copy(client, node->data);
pkgconf_node_insert(&flattened_dep->iter, flattened_dep, &world->requires_private);
pkgconf_node_insert(&flattened_dep->iter, flattened_dep, &world->requires_private);
}
}
}