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/shared/uid-range.c
+8 -13
View File
@@ -8,6 +8,7 @@
#include "macro.h"
#include "uid-range.h"
#include "user-util.h"
#include "util.h"
static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) {
assert(range);
@@ -45,20 +46,14 @@ static void uid_range_coalesce(UidRange **p, unsigned *n) {
}
}
static int uid_range_compare(const void *a, const void *b) {
const UidRange *x = a, *y = b;
static int uid_range_compare(const UidRange *a, const UidRange *b) {
int r;
if (x->start < y->start)
return -1;
if (x->start > y->start)
return 1;
r = CMP(a->start, b->start);
if (r != 0)
return r;
if (x->nr < y->nr)
return -1;
if (x->nr > y->nr)
return 1;
return 0;
return CMP(a->nr, b->nr);
}
int uid_range_add(UidRange **p, unsigned *n, uid_t start, uid_t nr) {
@@ -102,7 +97,7 @@ int uid_range_add(UidRange **p, unsigned *n, uid_t start, uid_t nr) {
x->nr = nr;
}
qsort(*p, *n, sizeof(UidRange), uid_range_compare);
typesafe_qsort(*p, *n, uid_range_compare);
uid_range_coalesce(p, n);
return *n;