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/mount/mount-tool.c
+6 -8
View File
@@ -1372,17 +1372,15 @@ struct item {
char* columns[_COLUMN_MAX];
};
static int compare_item(const void *a, const void *b) {
const struct item *x = a, *y = b;
if (x->columns[COLUMN_NODE] == y->columns[COLUMN_NODE])
static int compare_item(const struct item *a, const struct item *b) {
if (a->columns[COLUMN_NODE] == b->columns[COLUMN_NODE])
return 0;
if (!x->columns[COLUMN_NODE])
if (!a->columns[COLUMN_NODE])
return 1;
if (!y->columns[COLUMN_NODE])
if (!b->columns[COLUMN_NODE])
return -1;
return path_compare(x->columns[COLUMN_NODE], y->columns[COLUMN_NODE]);
return path_compare(a->columns[COLUMN_NODE], b->columns[COLUMN_NODE]);
}
static int list_devices(void) {
@@ -1485,7 +1483,7 @@ static int list_devices(void) {
goto finish;
}
qsort_safe(items, n, sizeof(struct item), compare_item);
typesafe_qsort(items, n, compare_item);
(void) pager_open(arg_no_pager, false);