picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tmpfiles: use qsort_safe

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-04-10 18:57:05 -04:00
parent 7a03974a6f
commit dd449aca61
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/tmpfiles/tmpfiles.c
View File

@ -1635,17 +1635,6 @@ static int item_compare(const void *a, const void *b) {
return (int) x->type - (int) y->type;
}
static void item_array_sort(ItemArray *a) {
/* Sort an item array, to enforce stable ordering in which we
* apply things. */
if (a->count <= 1)
return;
qsort(a->items, a->count, sizeof(Item), item_compare);
}
static bool item_compatible(Item *a, Item *b) {
assert(a);
assert(b);
@ -1980,7 +1969,9 @@ static int parse_line(const char *fname, unsigned line, const char *buffer) {
return log_oom();
memcpy(existing->items + existing->count++, &i, sizeof(i));
item_array_sort(existing);
/* Sort item array, to enforce stable ordering of application */
qsort_safe(existing->items, existing->count, sizeof(Item), item_compare);
zero(i);
return 0;