summaryrefslogtreecommitdiff
path: root/src/udev/udevadm-hwdb.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2018-09-18 08:39:24 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2018-09-19 08:02:52 +0900
commit93bab288956f43c70f2b28a88efdc9effd951bb5 (patch)
tree453abf294f7bf2aba7ccf7ed37ccd669ec231c95 /src/udev/udevadm-hwdb.c
parent6058516a14ada1748313af6783f5b4e7e3006654 (diff)
downloadsystemd-93bab288956f43c70f2b28a88efdc9effd951bb5.tar.gz
tree-wide: use typesafe_qsort()
Diffstat (limited to 'src/udev/udevadm-hwdb.c')
-rw-r--r--src/udev/udevadm-hwdb.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index 9dbbd1bf95..3e9a194532 100644
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -72,11 +72,8 @@ struct trie_value_entry {
size_t value_off;
};
-static int trie_children_cmp(const void *v1, const void *v2) {
- const struct trie_child_entry *n1 = v1;
- const struct trie_child_entry *n2 = v2;
-
- return n1->c - n2->c;
+static int trie_children_cmp(const struct trie_child_entry *a, const struct trie_child_entry *b) {
+ return CMP(a->c, b->c);
}
static int node_add_child(struct trie *trie, struct trie_node *node, struct trie_node *node_child, uint8_t c) {
@@ -92,7 +89,7 @@ static int node_add_child(struct trie *trie, struct trie_node *node, struct trie
node->children[node->children_count].c = c;
node->children[node->children_count].child = node_child;
node->children_count++;
- qsort(node->children, node->children_count, sizeof(struct trie_child_entry), trie_children_cmp);
+ typesafe_qsort(node->children, node->children_count, trie_children_cmp);
trie->nodes_count++;
return 0;
@@ -105,7 +102,7 @@ static struct trie_node *node_lookup(const struct trie_node *node, uint8_t c) {
search.c = c;
child = bsearch_safe(&search,
node->children, node->children_count, sizeof(struct trie_child_entry),
- trie_children_cmp);
+ (comparison_fn_t) trie_children_cmp);
if (child)
return child->child;
return NULL;