basic/ordered-set: add functions to operate on OrderedSets of strings

diff --git a/src/basic/ordered-set.c b/src/basic/ordered-set.c
index ed9ba776a40b8aec991fd9f0dacbc7158a8bfad3..5a4a637b68f5bbf0f396829b0b1f504de7991937 100644 (file)
--- a/src/basic/ordered-set.c
+++ b/src/basic/ordered-set.c
@@ -45,3 +45,21 @@ int ordered_set_put_strdupv(OrderedSet *s, char **l) {
 
         return n;
 }
+
+int ordered_set_put_string_set(OrderedSet *s, OrderedSet *l) {
+        int n = 0, r;
+        Iterator i;
+        char *p;
+
+        /* Like ordered_set_put_strv, but for an OrderedSet of strings */
+
+        ORDERED_SET_FOREACH(p, l, i) {
+                r = ordered_set_put_strdup(s, p);
+                if (r < 0)
+                        return r;
+
+                n += r;
+        }
+
+        return n;
+}

diff --git a/src/basic/ordered-set.h b/src/basic/ordered-set.h
index 7cbb71819b70598263916ca7ef2203f1f24dc7fe..4a0a064557f88530e3f79d8801afd8caff09e1bc 100644 (file)
--- a/src/basic/ordered-set.h
+++ b/src/basic/ordered-set.h
@@ -48,9 +48,14 @@ static inline void* ordered_set_steal_first(OrderedSet *s) {
         return ordered_hashmap_steal_first((OrderedHashmap*) s);
 }
 
+static inline char **ordered_set_get_strv(OrderedSet *s) {
+        return internal_hashmap_get_strv(HASHMAP_BASE((OrderedHashmap*) s));
+}
+
 int ordered_set_consume(OrderedSet *s, void *p);
 int ordered_set_put_strdup(OrderedSet *s, const char *p);
 int ordered_set_put_strdupv(OrderedSet *s, char **l);
+int ordered_set_put_string_set(OrderedSet *s, OrderedSet *l);
 
 #define ORDERED_SET_FOREACH(e, s, i)                                    \
         for ((i) = ITERATOR_FIRST; ordered_set_iterate((s), &(i), (void**)&(e)); )

diff --git a/src/test/test-ordered-set.c b/src/test/test-ordered-set.c
index d6a96a18cf1c91968f650e7bcd670d8800d6ae5c..45b035731927cf053f4810c20b82ac89edcb6b82 100644 (file)
--- a/src/test/test-ordered-set.c
+++ b/src/test/test-ordered-set.c
@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include "ordered-set.h"
+#include "string-util.h"
+#include "strv.h"
 
 static void test_set_steal_first(void) {
         _cleanup_ordered_set_free_ OrderedSet *m = NULL;
@@ -49,6 +51,7 @@ static void test_set_free_with_hash_ops(void) {
 
 static void test_set_put(void) {
         _cleanup_ordered_set_free_ OrderedSet *m = NULL;
+        _cleanup_free_ char **t = NULL;
 
         m = ordered_set_new(&string_hash_ops);
         assert_se(m);
@@ -61,12 +64,48 @@ static void test_set_put(void) {
         assert_se(ordered_set_put(m, (void*) "333") == 1);
         assert_se(ordered_set_put(m, (void*) "333") == 0);
         assert_se(ordered_set_put(m, (void*) "22") == 0);
+
+        assert_se(t = ordered_set_get_strv(m));
+        assert_se(streq(t[0], "1"));
+        assert_se(streq(t[1], "22"));
+        assert_se(streq(t[2], "333"));
+        assert_se(!t[3]);
+}
+
+static void test_set_put_string_set(void) {
+        _cleanup_ordered_set_free_free_ OrderedSet *m = NULL;
+        _cleanup_ordered_set_free_ OrderedSet *q = NULL;
+        _cleanup_free_ char **final = NULL; /* "just free" because the strings are in the set */
+        void *t;
+
+        m = ordered_set_new(&string_hash_ops);
+        assert_se(m);
+
+        q = ordered_set_new(&string_hash_ops);
+        assert_se(q);
+
+        assert_se(t = strdup("1"));
+        assert_se(ordered_set_put(m, t) == 1);
+        assert_se(t = strdup("22"));
+        assert_se(ordered_set_put(m, t) == 1);
+        assert_se(t = strdup("333"));
+        assert_se(ordered_set_put(m, t) == 1);
+
+        assert_se(ordered_set_put(q, (void*) "11") == 1);
+        assert_se(ordered_set_put(q, (void*) "22") == 1);
+        assert_se(ordered_set_put(q, (void*) "33") == 1);
+
+        assert_se(ordered_set_put_string_set(m, q) == 2);
+
+        assert_se(final = ordered_set_get_strv(m));
+        assert_se(strv_equal(final, STRV_MAKE("1", "22", "333", "11", "33")));
 }
 
 int main(int argc, const char *argv[]) {
         test_set_steal_first();
         test_set_free_with_hash_ops();
         test_set_put();
+        test_set_put_string_set();
 
         return 0;
 }

diff --git a/src/test/test-set.c b/src/test/test-set.c
index 340edeb65f605c442793463eb2ce1d4c457f5b90..b4e7a52fd964aef5713d42283526be2ab18106b3 100644 (file)
--- a/src/test/test-set.c
+++ b/src/test/test-set.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include "set.h"
+#include "strv.h"
 
 static void test_set_steal_first(void) {
         _cleanup_set_free_ Set *m = NULL;
@@ -77,6 +78,12 @@ static void test_set_put(void) {
         assert_se(set_put(m, (void*) "333") == 1);
         assert_se(set_put(m, (void*) "333") == 0);
         assert_se(set_put(m, (void*) "22") == 0);
+
+        _cleanup_free_ char **t = set_get_strv(m);
+        assert_se(strv_contains(t, "1"));
+        assert_se(strv_contains(t, "22"));
+        assert_se(strv_contains(t, "333"));
+        assert_se(strv_length(t) == 3);
 }
 
 int main(int argc, const char *argv[]) {