pal1000
/
pkgconf
forked from ariadne/pkgconf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: refactor apply_variable

master
Ariadne Conill 2022-06-26 18:17:30 +00:00
parent a1a415111f
commit 04a6dda79f
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cli/main.c
View File

@ -346,16 +346,6 @@ apply_path(pkgconf_client_t *client, pkgconf_pkg_t *world, void *unused, int max
return true; return true;
} }
static void
print_variable(pkgconf_client_t *client, pkgconf_pkg_t *pkg, const char *variable)
{
const char *var;
var = pkgconf_tuple_find(client, &pkg->vars, variable);
if (var != NULL)
printf("%s", var);
}
static bool static bool
apply_variable(pkgconf_client_t *client, pkgconf_pkg_t *world, void *variable, int maxdepth) apply_variable(pkgconf_client_t *client, pkgconf_pkg_t *world, void *variable, int maxdepth)
{ {
@ -366,11 +356,12 @@ apply_variable(pkgconf_client_t *client, pkgconf_pkg_t *world, void *variable, i
{ {
pkgconf_dependency_t *dep = iter->data; pkgconf_dependency_t *dep = iter->data;
pkgconf_pkg_t *pkg = dep->match; pkgconf_pkg_t *pkg = dep->match;
const char *var;
if (iter->prev != NULL) var = pkgconf_tuple_find(client, &pkg->vars, variable);
printf(" ");
print_variable(client, pkg, variable); if (var != NULL)
printf("%s%s", iter->prev != NULL ? " " : "", var);
} }
printf("\n"); printf("\n");