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

tree-wide: use typesafe_qsort_r()

Browse Source
This commit is contained in:
Yu Watanabe
2018-09-19 08:05:13 +09:00
parent 5532395be7
commit ba0a7bfb98
3 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/format-table.c
+3 -10
View File
@@ -729,9 +729,7 @@ 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) {
const size_t *a = x, *b = y;
Table *t = userdata;
static int table_data_compare(const size_t *a, const size_t *b, Table *t) {
size_t i;
int r;
@@ -759,12 +757,7 @@ static int table_data_compare(const void *x, const void *y, void *userdata) {
}
/* Order identical lines by the order there were originally added in */
if (*a < *b)
return -1;
if (*a > *b)
return 1;
return 0;
return CMP(*a, *b);
}
static const char *table_data_format(TableData *d) {
@@ -944,7 +937,7 @@ 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);
typesafe_qsort_r(sorted, n_rows, table_data_compare, t);
}
if (t->display_map)