SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tree-wide: use typesafe_qsort()

Browse Source
This commit is contained in:
Yu Watanabe
2018-09-19 08:02:52 +09:00
parent 6058516a14
commit 93bab28895
35 changed files with 243 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd-network/sd-lldp.c
+3 -5
View File
@@ -371,10 +371,8 @@ _public_ int sd_lldp_new(sd_lldp **ret) {
return 0;
}
static int neighbor_compare_func(const void *a, const void *b) {
const sd_lldp_neighbor * const*x = a, * const *y = b;
return lldp_neighbor_id_hash_ops.compare(&(*x)->id, &(*y)->id);
static int neighbor_compare_func(sd_lldp_neighbor * const *a, sd_lldp_neighbor * const *b) {
return lldp_neighbor_id_hash_ops.compare(&(*a)->id, &(*b)->id);
}
static int on_timer_event(sd_event_source *s, uint64_t usec, void *userdata) {
@@ -462,7 +460,7 @@ _public_ int sd_lldp_get_neighbors(sd_lldp *lldp, sd_lldp_neighbor ***ret) {
assert((size_t) k == hashmap_size(lldp->neighbor_by_id));
/* Return things in a stable order */
qsort(l, k, sizeof(sd_lldp_neighbor*), neighbor_compare_func);
typesafe_qsort(l, k, neighbor_compare_func);
*ret = l;
return k;