From d74a4de6daea5a511c2b5636bbb552c15b3a4ad9 Mon Sep 17 00:00:00 2001 From: Emil Renner Berthing Date: Thu, 18 Sep 2014 15:24:56 +0200 Subject: [PATCH] don't use glibc-specific qsort_r Upstream-Status: Inappropriate [musl specific] Signed-off-by: Khem Raj --- src/basic/format-table.c | 27 ++++++++++++++++----------- src/basic/util.h | 7 ------- src/hwdb/hwdb.c | 18 +++++++++++------- src/udev/udevadm-hwdb.c | 16 ++++++++++------ 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/src/basic/format-table.c b/src/basic/format-table.c index 94e796d1ca..9b3f35c29a 100644 --- a/src/basic/format-table.c +++ b/src/basic/format-table.c @@ -745,29 +745,29 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t return 0; } -static int table_data_compare(const void *x, const void *y, void *userdata) { +static Table *user_table; +static int table_data_compare(const void *x, const void *y) { const size_t *a = x, *b = y; - Table *t = userdata; size_t i; int r; - assert(t); - assert(t->sort_map); + assert(user_table); + assert(user_table->sort_map); /* Make sure the header stays at the beginning */ - if (*a < t->n_columns && *b < t->n_columns) + if (*a < user_table->n_columns && *b < user_table->n_columns) return 0; - if (*a < t->n_columns) + if (*a < user_table->n_columns) return -1; - if (*b < t->n_columns) + if (*b < user_table->n_columns) return 1; /* Order other lines by the sorting map */ - for (i = 0; i < t->n_sort_map; i++) { + for (i = 0; i < user_table->n_sort_map; i++) { TableData *d, *dd; - d = t->data[*a + t->sort_map[i]]; - dd = t->data[*b + t->sort_map[i]]; + d = user_table->data[*a + user_table->sort_map[i]]; + dd = user_table->data[*b + user_table->sort_map[i]]; r = cell_data_compare(d, *a, dd, *b); if (r != 0) @@ -960,7 +960,12 @@ int table_print(Table *t, FILE *f) { for (i = 0; i < n_rows; i++) sorted[i] = i * t->n_columns; - qsort_r_safe(sorted, n_rows, sizeof(size_t), table_data_compare, t); + if (n_rows <= 1) + return 0; + assert(sorted); + user_table = t; + qsort(sorted, n_rows, sizeof(size_t), table_data_compare); + user_table = NULL; } if (t->display_map) diff --git a/src/basic/util.h b/src/basic/util.h index 9699d228f9..40eaf518cb 100644 --- a/src/basic/util.h +++ b/src/basic/util.h @@ -105,13 +105,6 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, comparison_ qsort_safe((p), (n), sizeof((p)[0]), (__compar_fn_t) _func_); \ }) -static inline void qsort_r_safe(void *base, size_t nmemb, size_t size, int (*compar)(const void*, const void*, void*), void *userdata) { - if (nmemb <= 1) - return; - - assert(base); - qsort_r(base, nmemb, size, compar, userdata); -} /** * Normal memcpy requires src to be nonnull. We do nothing if n is 0. diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c index 317cad8a67..701d59a1eb 100644 --- a/src/hwdb/hwdb.c +++ b/src/hwdb/hwdb.c @@ -135,13 +135,12 @@ static void trie_free(struct trie *trie) { DEFINE_TRIVIAL_CLEANUP_FUNC(struct trie*, trie_free); -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, @@ -166,7 +165,10 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, .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) { /* At this point we have 2 identical properties on the same match-string. * Since we process files in order, we just replace the previous value. @@ -191,7 +193,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, node->values[node->values_count].file_priority = file_priority; node->values[node->values_count].line_number = line_number; 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; } diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c index 02408a4285..491d367d12 100644 --- a/src/udev/udevadm-hwdb.c +++ b/src/udev/udevadm-hwdb.c @@ -114,13 +114,13 @@ static void trie_node_cleanup(struct trie_node *node) { 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, @@ -141,7 +141,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, .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; @@ -158,7 +160,9 @@ static int trie_node_add_value(struct trie *trie, struct trie_node *node, 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; } -- 2.18.0