From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 2 May 2018 08:54:52 +0000 (+0900)
Subject: set: drop unused set_make() function (#8879)
X-Git-Tag: v239~330
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=76283e5fd46ca449ba4ce482e444119c8b495aa3;p=thirdparty%2Fsystemd.git

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 4f63fcef1ce..cff1b9d18ff 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -163,7 +163,6 @@ basic_sources = files('''
         securebits.h
         selinux-util.c
         selinux-util.h
-        set.c
         set.h
         sigbus.c
         sigbus.h
diff --git a/src/basic/set.c b/src/basic/set.c
deleted file mode 100644
index 4a10c74a3ac..00000000000
--- a/src/basic/set.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  This file is part of systemd.
-
-  Copyright 2017 Lennart Poettering
-***/
-
-#include "alloc-util.h"
-#include "set.h"
-
-int set_make(Set **ret, const struct hash_ops *hash_ops HASHMAP_DEBUG_PARAMS, void *add, ...) {
-        _cleanup_set_free_ Set *s = NULL;
-        int r;
-
-        assert(ret);
-
-        s = set_new(hash_ops HASHMAP_DEBUG_PASS_ARGS);
-        if (!s)
-                return -ENOMEM;
-
-        if (add) {
-                va_list ap;
-
-                r = set_put(s, add);
-                if (r < 0)
-                        return r;
-
-                va_start(ap, add);
-
-                for (;;) {
-                        void *arg = va_arg(ap, void*);
-
-                        if (!arg)
-                                break;
-
-                        r = set_put(s, arg);
-                        if (r < 0) {
-                                va_end(ap);
-                                return r;
-                        }
-                }
-
-                va_end(ap);
-        }
-
-        *ret = TAKE_PTR(s);
-
-        return 0;
-}
diff --git a/src/basic/set.h b/src/basic/set.h
index 6f937af9292..dc0f1e17e62 100644
--- a/src/basic/set.h
+++ b/src/basic/set.h
@@ -136,5 +136,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 11884de1f78..9774fbb3801 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;
 }