X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fset.c;h=5a4bf11bdfda45b01d4ef63ad9220c127c2daa99;hp=cd910d70abbc403eb54ae8eb50871c36f93929d6;hb=8f2665a463ffb2b822c1e3effdb292d2bddf72be;hpb=e3ded78be7df143ba780dd55ca8897fdddd67460

diff --git a/src/shared/set.c b/src/shared/set.c
index cd910d70a..5a4bf11bd 100644
--- a/src/shared/set.c
+++ b/src/shared/set.c
@@ -37,26 +37,10 @@ void set_free(Set* s) {
         hashmap_free(MAKE_HASHMAP(s));
 }
 
-void set_freep(Set **s) {
-        if (!s)
-                return;
-
-        set_free(*s);
-        *s = NULL;
-}
-
 void set_free_free(Set *s) {
         hashmap_free_free(MAKE_HASHMAP(s));
 }
 
-void set_free_freep(Set **s) {
-        if (!*s)
-                return;
-
-        set_free_free(*s);
-        *s = NULL;
-}
-
 int set_ensure_allocated(Set **s, hash_func_t hash_func, compare_func_t compare_func) {
         return hashmap_ensure_allocated((Hashmap**) s, hash_func, compare_func);
 }
@@ -65,6 +49,16 @@ int set_put(Set *s, void *value) {
         return hashmap_put(MAKE_HASHMAP(s), value, value);
 }
 
+int set_consume(Set *s, void *value) {
+        int r;
+
+        r = set_put(s, value);
+        if (r < 0)
+                free(value);
+
+        return r;
+}
+
 int set_replace(Set *s, void *value) {
         return hashmap_replace(MAKE_HASHMAP(s), value, value);
 }