From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 16 Sep 2022 01:20:55 +0000 (+0900)
Subject: uid-range: sort uid range entries in uid_range_coalesce()
X-Git-Tag: v252-rc1~178^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34eeba475d6f5fd464357df35012a30498619880;p=thirdparty%2Fsystemd.git

uid-range: sort uid range entries in uid_range_coalesce()

As the logic in uid_range_coalesce() assumes the array of entries are
already sorted.
No functional changes, just refactoring.
---

diff --git a/src/basic/uid-range.c b/src/basic/uid-range.c
index f7a9a070c72..2f16bb8916c 100644
--- a/src/basic/uid-range.c
+++ b/src/basic/uid-range.c
@@ -22,10 +22,28 @@ static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) {
                 range->start + range->nr >= start;
 }
 
+static int uid_range_compare(const UidRange *a, const UidRange *b) {
+        int r;
+
+        assert(a);
+        assert(b);
+
+        r = CMP(a->start, b->start);
+        if (r != 0)
+                return r;
+
+        return CMP(a->nr, b->nr);
+}
+
 static void uid_range_coalesce(UidRange **p, size_t *n) {
         assert(p);
         assert(n);
 
+        if (*n <= 1)
+                return;
+
+        typesafe_qsort(*p, *n, uid_range_compare);
+
         for (size_t i = 0; i < *n; i++) {
                 for (size_t j = i + 1; j < *n; j++) {
                         UidRange *x = (*p)+i, *y = (*p)+j;
@@ -49,16 +67,6 @@ static void uid_range_coalesce(UidRange **p, size_t *n) {
         }
 }
 
-static int uid_range_compare(const UidRange *a, const UidRange *b) {
-        int r;
-
-        r = CMP(a->start, b->start);
-        if (r != 0)
-                return r;
-
-        return CMP(a->nr, b->nr);
-}
-
 int uid_range_add(UidRange **p, size_t *n, uid_t start, uid_t nr) {
         bool found = false;
         UidRange *x;
@@ -102,7 +110,6 @@ int uid_range_add(UidRange **p, size_t *n, uid_t start, uid_t nr) {
                 x->nr = nr;
         }
 
-        typesafe_qsort(*p, *n, uid_range_compare);
         uid_range_coalesce(p, n);
 
         return *n;