set: drop unused set_make() function (#8879)

The function causes compiler error when built with '-Ddebug=hashmap',
and is not used anymore. Let's drop it.

diff --git a/src/basic/meson.build b/src/basic/meson.build
index 5eeeb01864486e3273452a18385b5b2e3ed9a6ea..bc7e7865584d2b6cec24e4d2bde97b11377398b6 100644 (file)
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -164,7 +164,6 @@
 #         securebits.h
 #         selinux-util.c
 #         selinux-util.h
-#         set.c
 #         set.h
 #         sigbus.c
 #         sigbus.h

diff --git a/src/basic/set.h b/src/basic/set.h
index e85a6b22177a14f122dccaeb99aa25d2409de256..caad46ced06baaf99e0ac0dca393830a157741cd 100644 (file)
--- a/src/basic/set.h
+++ b/src/basic/set.h
@@ -140,5 +140,3 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Set*, set_free_free);
 
 #define _cleanup_set_free_ _cleanup_(set_freep)
 #define _cleanup_set_free_free_ _cleanup_(set_free_freep)
-
-int set_make(Set **ret, const struct hash_ops *hash_ops HASHMAP_DEBUG_PARAMS, void *add, ...);

diff --git a/src/test/test-set.c b/src/test/test-set.c
index 11884de1f78bdd771887c7c3f55bc980354e9174..9774fbb3801d3bbd90fa3de3f672272214aec325 100644 (file)
--- a/src/test/test-set.c
+++ b/src/test/test-set.c
@@ -66,55 +66,10 @@ static void test_set_put(void) {
         assert_se(set_put(m, (void*) "22") == 0);
 }
 
-static void test_set_make(void) {
-        _cleanup_set_free_ Set *s = NULL;
-
-        assert_se(set_make(&s, NULL, UINT_TO_PTR(4), UINT_TO_PTR(6), UINT_TO_PTR(8), NULL) == 0);
-        assert_se(set_size(s) == 3);
-        assert_se(!set_contains(s, UINT_TO_PTR(0)));
-        assert_se(!set_contains(s, UINT_TO_PTR(1)));
-        assert_se(!set_contains(s, UINT_TO_PTR(2)));
-        assert_se(!set_contains(s, UINT_TO_PTR(3)));
-        assert_se(set_contains(s, UINT_TO_PTR(4)));
-        assert_se(!set_contains(s, UINT_TO_PTR(5)));
-        assert_se(set_contains(s, UINT_TO_PTR(6)));
-        assert_se(!set_contains(s, UINT_TO_PTR(7)));
-        assert_se(set_contains(s, UINT_TO_PTR(8)));
-        assert_se(!set_contains(s, UINT_TO_PTR(9)));
-        s = set_free(s);
-
-        assert_se(set_make(&s, NULL, NULL) == 0);
-        assert_se(set_size(s) == 0);
-        assert_se(!set_contains(s, UINT_TO_PTR(0)));
-        assert_se(!set_contains(s, UINT_TO_PTR(4)));
-        assert_se(!set_contains(s, UINT_TO_PTR(6)));
-        assert_se(!set_contains(s, UINT_TO_PTR(8)));
-        s = set_free(s);
-
-        assert_se(set_make(&s, NULL, UINT_TO_PTR(3), NULL) == 0);
-        assert_se(set_size(s) == 1);
-        assert_se(!set_contains(s, UINT_TO_PTR(0)));
-        assert_se(!set_contains(s, UINT_TO_PTR(1)));
-        assert_se(!set_contains(s, UINT_TO_PTR(2)));
-        assert_se(set_contains(s, UINT_TO_PTR(3)));
-        assert_se(!set_contains(s, UINT_TO_PTR(4)));
-
-        assert_se(set_make(&s, NULL, UINT_TO_PTR(2), UINT_TO_PTR(5), NULL) == 0);
-        assert_se(set_size(s) == 2);
-        assert_se(!set_contains(s, UINT_TO_PTR(0)));
-        assert_se(!set_contains(s, UINT_TO_PTR(1)));
-        assert_se(set_contains(s, UINT_TO_PTR(2)));
-        assert_se(!set_contains(s, UINT_TO_PTR(3)));
-        assert_se(!set_contains(s, UINT_TO_PTR(4)));
-        assert_se(set_contains(s, UINT_TO_PTR(5)));
-        assert_se(!set_contains(s, UINT_TO_PTR(6)));
-}
-
 int main(int argc, const char *argv[]) {
         test_set_steal_first();
         test_set_free_with_destructor();
         test_set_put();
-        test_set_make();
 
         return 0;
 }