shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-07 01:58:02 +03:00
Code

uid-range: escape from loop earlier

Browse Source 
The array of uid range entries are already sorted. Hence, if x and y are
does not have intersection, then the remaining entries neither have
intersection with x.
This commit is contained in:
Yu Watanabe 2022-09-16 10:29:56 +09:00
parent 34eeba475d
commit b5739767da
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/basic/uid-range.c
View File

@ -45,24 +45,26 @@ static void uid_range_coalesce(UidRange **p, size_t *n) {
typesafe_qsort(*p, *n, uid_range_compare);
for (size_t i = 0; i < *n; i++) {
UidRange *x = (*p) + i;
for (size_t j = i + 1; j < *n; j++) {
UidRange *x = (*p)+i, *y = (*p)+j;
UidRange *y = (*p)+j;
uid_t begin, end;
if (uid_range_intersect(x, y->start, y->nr)) {
uid_t begin, end;
if (!uid_range_intersect(x, y->start, y->nr))
break;
begin = MIN(x->start, y->start);
end = MAX(x->start + x->nr, y->start + y->nr);
begin = MIN(x->start, y->start);
end = MAX(x->start + x->nr, y->start + y->nr);
x->start = begin;
x->nr = end - begin;
x->start = begin;
x->nr = end - begin;
if (*n > j+1)
memmove(y, y+1, sizeof(UidRange) * (*n - j -1));
if (*n > j+1)
memmove(y, y+1, sizeof(UidRange) * (*n - j -1));
(*n)--;
j--;
}
(*n)--;
j--;
}
}
}