From 40cf14de903c5b8de6e8bd466059d007aecf6eaf Mon Sep 17 00:00:00 2001 From: Emil Renner Berthing Date: Thu, 18 Sep 2014 15:24:56 +0200 Subject: [PATCH 20/31] udevadm-hwdb: don't use glibc-specific qsort_r --- src/udev/udevadm-hwdb.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) --- a/src/udev/udevadm-hwdb.c +++ b/src/udev/udevadm-hwdb.c @@ -123,13 +123,13 @@ static void trie_node_cleanup(struct tri free(node); } -static int trie_values_cmp(const void *v1, const void *v2, void *arg) { +static struct trie *trie_node_add_value_trie; +static int trie_values_cmp(const void *v1, const void *v2) { const struct trie_value_entry *val1 = v1; const struct trie_value_entry *val2 = v2; - struct trie *trie = arg; - return strcmp(trie->strings->buf + val1->key_off, - trie->strings->buf + val2->key_off); + return strcmp(trie_node_add_value_trie->strings->buf + val1->key_off, + trie_node_add_value_trie->strings->buf + val2->key_off); } static int trie_node_add_value(struct trie *trie, struct trie_node *node, @@ -150,7 +150,9 @@ static int trie_node_add_value(struct tr .value_off = v, }; - val = xbsearch_r(&search, node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp, trie); + trie_node_add_value_trie = trie; + val = bsearch(&search, node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp); + trie_node_add_value_trie = NULL; if (val) { /* replace existing earlier key with new value */ val->value_off = v; @@ -167,7 +169,9 @@ static int trie_node_add_value(struct tr node->values[node->values_count].key_off = k; node->values[node->values_count].value_off = v; node->values_count++; - qsort_r(node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp, trie); + trie_node_add_value_trie = trie; + qsort(node->values, node->values_count, sizeof(struct trie_value_entry), trie_values_cmp); + trie_node_add_value_trie = NULL; return 0; }