From d68a867dc0297b51925d7d4ecc6704b147fd7116 Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Sun, 26 Jun 2022 19:15:07 +0000 Subject: [PATCH] tuple: fall back to using globals rather than preferring them --- libpkgconf/tuple.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libpkgconf/tuple.c b/libpkgconf/tuple.c index 0199709..c422310 100644 --- a/libpkgconf/tuple.c +++ b/libpkgconf/tuple.c @@ -218,10 +218,6 @@ char * pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const char *key) { pkgconf_node_t *node; - char *res; - - if ((res = pkgconf_tuple_find_global(client, key)) != NULL) - return res; PKGCONF_FOREACH_LIST_ENTRY(list->head, node) { @@ -231,7 +227,7 @@ pkgconf_tuple_find(const pkgconf_client_t *client, pkgconf_list_t *list, const c return tuple->value; } - return NULL; + return pkgconf_tuple_find_global(client, key); } /*