summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/basic/meson.build1
-rw-r--r--src/basic/set.h2
-rw-r--r--src/test/test-set.c45
3 files changed, 0 insertions, 48 deletions
diff --git a/src/basic/meson.build b/src/basic/meson.build
index 5eeeb0186..bc7e78655 100644
--- 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 e85a6b221..caad46ced 100644
--- 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 11884de1f..9774fbb38 100644
--- 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;
}