uid-range: tie up number and array of uid range entries

This renames UidRange -> UidRangeEntry, and reintroduces UidRange which
contains the array of UidRangeEntry and its size.
No fucntional changes, just refactoring.

1 files changed, 85 insertions, 87 deletions

diff --git a/src/test/test-uid-range.c b/src/test/test-uid-range.c
index be8530bdd8..2ed557dd13 100644
--- a/src/test/test-uid-range.c
+++ b/src/test/test-uid-range.c
@@ -15,105 +15,104 @@
 #include "virt.h"
 
 TEST(uid_range) {
-        _cleanup_free_ UidRange *p = NULL;
-        size_t n = 0;
+        _cleanup_(uid_range_freep) UidRange *p = NULL;
         uid_t search;
 
-        assert_se(uid_range_covers(p, n, 0, 0));
-        assert_se(!uid_range_covers(p, n, 0, 1));
-        assert_se(!uid_range_covers(p, n, 100, UINT32_MAX));
-
-        assert_se(uid_range_add_str(&p, &n, "500-999") >= 0);
-        assert_se(n == 1);
-        assert_se(p[0].start == 500);
-        assert_se(p[0].nr == 500);
-
-        assert_se(!uid_range_contains(p, n, 499));
-        assert_se(uid_range_contains(p, n, 500));
-        assert_se(uid_range_contains(p, n, 999));
-        assert_se(!uid_range_contains(p, n, 1000));
-
-        assert_se(!uid_range_covers(p, n, 100, 150));
-        assert_se(!uid_range_covers(p, n, 400, 200));
-        assert_se(!uid_range_covers(p, n, 499, 1));
-        assert_se(uid_range_covers(p, n, 500, 1));
-        assert_se(uid_range_covers(p, n, 501, 10));
-        assert_se(uid_range_covers(p, n, 999, 1));
-        assert_se(!uid_range_covers(p, n, 999, 2));
-        assert_se(!uid_range_covers(p, n, 1000, 1));
-        assert_se(!uid_range_covers(p, n, 1000, 100));
-        assert_se(!uid_range_covers(p, n, 1001, 100));
+        assert_se(uid_range_covers(p, 0, 0));
+        assert_se(!uid_range_covers(p, 0, 1));
+        assert_se(!uid_range_covers(p, 100, UINT32_MAX));
+
+        assert_se(uid_range_add_str(&p, "500-999") >= 0);
+        assert_se(p);
+        assert_se(p->n_entries == 1);
+        assert_se(p->entries[0].start == 500);
+        assert_se(p->entries[0].nr == 500);
+
+        assert_se(!uid_range_contains(p, 499));
+        assert_se(uid_range_contains(p, 500));
+        assert_se(uid_range_contains(p, 999));
+        assert_se(!uid_range_contains(p, 1000));
+
+        assert_se(!uid_range_covers(p, 100, 150));
+        assert_se(!uid_range_covers(p, 400, 200));
+        assert_se(!uid_range_covers(p, 499, 1));
+        assert_se(uid_range_covers(p, 500, 1));
+        assert_se(uid_range_covers(p, 501, 10));
+        assert_se(uid_range_covers(p, 999, 1));
+        assert_se(!uid_range_covers(p, 999, 2));
+        assert_se(!uid_range_covers(p, 1000, 1));
+        assert_se(!uid_range_covers(p, 1000, 100));
+        assert_se(!uid_range_covers(p, 1001, 100));
 
         search = UID_INVALID;
-        assert_se(uid_range_next_lower(p, n, &search));
+        assert_se(uid_range_next_lower(p, &search));
         assert_se(search == 999);
-        assert_se(uid_range_next_lower(p, n, &search));
+        assert_se(uid_range_next_lower(p, &search));
         assert_se(search == 998);
         search = 501;
-        assert_se(uid_range_next_lower(p, n, &search));
+        assert_se(uid_range_next_lower(p, &search));
         assert_se(search == 500);
-        assert_se(uid_range_next_lower(p, n, &search) == -EBUSY);
-
-        assert_se(uid_range_add_str(&p, &n, "1000") >= 0);
-        assert_se(n == 1);
-        assert_se(p[0].start == 500);
-        assert_se(p[0].nr == 501);
-
-        assert_se(uid_range_add_str(&p, &n, "30-40") >= 0);
-        assert_se(n == 2);
-        assert_se(p[0].start == 30);
-        assert_se(p[0].nr == 11);
-        assert_se(p[1].start == 500);
-        assert_se(p[1].nr == 501);
-
-        assert_se(uid_range_add_str(&p, &n, "60-70") >= 0);
-        assert_se(n == 3);
-        assert_se(p[0].start == 30);
-        assert_se(p[0].nr == 11);
-        assert_se(p[1].start == 60);
-        assert_se(p[1].nr == 11);
-        assert_se(p[2].start == 500);
-        assert_se(p[2].nr == 501);
-
-        assert_se(uid_range_add_str(&p, &n, "20-2000") >= 0);
-        assert_se(n == 1);
-        assert_se(p[0].start == 20);
-        assert_se(p[0].nr == 1981);
-
-        assert_se(uid_range_add_str(&p, &n, "2002") >= 0);
-        assert_se(n == 2);
-        assert_se(p[0].start == 20);
-        assert_se(p[0].nr == 1981);
-        assert_se(p[1].start == 2002);
-        assert_se(p[1].nr == 1);
-
-        assert_se(uid_range_add_str(&p, &n, "2001") >= 0);
-        assert_se(n == 1);
-        assert_se(p[0].start == 20);
-        assert_se(p[0].nr == 1983);
+        assert_se(uid_range_next_lower(p, &search) == -EBUSY);
+
+        assert_se(uid_range_add_str(&p, "1000") >= 0);
+        assert_se(p->n_entries == 1);
+        assert_se(p->entries[0].start == 500);
+        assert_se(p->entries[0].nr == 501);
+
+        assert_se(uid_range_add_str(&p, "30-40") >= 0);
+        assert_se(p->n_entries == 2);
+        assert_se(p->entries[0].start == 30);
+        assert_se(p->entries[0].nr == 11);
+        assert_se(p->entries[1].start == 500);
+        assert_se(p->entries[1].nr == 501);
+
+        assert_se(uid_range_add_str(&p, "60-70") >= 0);
+        assert_se(p->n_entries == 3);
+        assert_se(p->entries[0].start == 30);
+        assert_se(p->entries[0].nr == 11);
+        assert_se(p->entries[1].start == 60);
+        assert_se(p->entries[1].nr == 11);
+        assert_se(p->entries[2].start == 500);
+        assert_se(p->entries[2].nr == 501);
+
+        assert_se(uid_range_add_str(&p, "20-2000") >= 0);
+        assert_se(p->n_entries == 1);
+        assert_se(p->entries[0].start == 20);
+        assert_se(p->entries[0].nr == 1981);
+
+        assert_se(uid_range_add_str(&p, "2002") >= 0);
+        assert_se(p->n_entries == 2);
+        assert_se(p->entries[0].start == 20);
+        assert_se(p->entries[0].nr == 1981);
+        assert_se(p->entries[1].start == 2002);
+        assert_se(p->entries[1].nr == 1);
+
+        assert_se(uid_range_add_str(&p, "2001") >= 0);
+        assert_se(p->n_entries == 1);
+        assert_se(p->entries[0].start == 20);
+        assert_se(p->entries[0].nr == 1983);
 }
 
 TEST(load_userns) {
+        _cleanup_(uid_range_freep) UidRange *p = NULL;
         _cleanup_(unlink_and_freep) char *fn = NULL;
-        _cleanup_free_ UidRange *p = NULL;
         _cleanup_fclose_ FILE *f = NULL;
-        size_t n = 0;
         int r;
 
-        r = uid_range_load_userns(&p, &n, NULL);
-        if (ERRNO_IS_NOT_SUPPORTED(r))
+        r = uid_range_load_userns(&p, NULL);
+        if (r < 0 && ERRNO_IS_NOT_SUPPORTED(r))
                 return;
 
         assert_se(r >= 0);
-        assert_se(uid_range_contains(p, n, getuid()));
+        assert_se(uid_range_contains(p, getuid()));
 
         r = running_in_userns();
         if (r == 0) {
-                assert_se(n == 1);
-                assert_se(p[0].start == 0);
-                assert_se(p[0].nr == UINT32_MAX);
+                assert_se(p->n_entries == 1);
+                assert_se(p->entries[0].start == 0);
+                assert_se(p->entries[0].nr == UINT32_MAX);
 
-                assert_se(uid_range_covers(p, n, 0, UINT32_MAX));
+                assert_se(uid_range_covers(p, 0, UINT32_MAX));
         }
 
         assert_se(fopen_temporary(NULL, &f, &fn) >= 0);
@@ -121,19 +120,18 @@ TEST(load_userns) {
               "100 0 20\n", f);
         assert_se(fflush_and_check(f) >= 0);
 
-        p = mfree(p);
-        n = 0;
+        p = uid_range_free(p);
 
-        assert_se(uid_range_load_userns(&p, &n, fn) >= 0);
+        assert_se(uid_range_load_userns(&p, fn) >= 0);
 
-        assert_se(uid_range_contains(p, n, 0));
-        assert_se(uid_range_contains(p, n, 19));
-        assert_se(!uid_range_contains(p, n, 20));
+        assert_se(uid_range_contains(p, 0));
+        assert_se(uid_range_contains(p, 19));
+        assert_se(!uid_range_contains(p, 20));
 
-        assert_se(!uid_range_contains(p, n, 99));
-        assert_se(uid_range_contains(p, n, 100));
-        assert_se(uid_range_contains(p, n, 119));
-        assert_se(!uid_range_contains(p, n, 120));
+        assert_se(!uid_range_contains(p, 99));
+        assert_se(uid_range_contains(p, 100));
+        assert_se(uid_range_contains(p, 119));
+        assert_se(!uid_range_contains(p, 120));
 }
 
 DEFINE_TEST_MAIN(LOG_DEBUG);