strv: add new STR_IN_SET() macro that operates similar to IN_SET() but for strings

[elogind.git] / src / shared / set.h

diff --git a/src/shared/set.h b/src/shared/set.h
index 2f792585faea545d426c0cdce023a44b0f5adba4..5612478d4e88ecf7cb3d25633a2a9b07c93a4946 100644 (file)
--- a/src/shared/set.h
+++ b/src/shared/set.h
@@ -28,18 +28,19 @@
  * for each set use. */
 
 #include "hashmap.h"
+#include "util.h"
 
 typedef struct Set Set;
 
 Set *set_new(hash_func_t hash_func, compare_func_t compare_func);
 void set_free(Set* s);
-void set_freep(Set **s);
 void set_free_free(Set *s);
-void set_free_freep(Set **s);
+
 Set* set_copy(Set *s);
 int set_ensure_allocated(Set **s, hash_func_t hash_func, compare_func_t compare_func);
 
 int set_put(Set *s, void *value);
+int set_consume(Set *s, void *value);
 int set_replace(Set *s, void *value);
 void *set_get(Set *s, void *value);
 bool set_contains(Set *s, void *value);
@@ -71,3 +72,8 @@ char **set_get_strv(Set *s);
 
 #define SET_FOREACH_BACKWARDS(e, s, i) \
         for ((i) = ITERATOR_LAST, (e) = set_iterate_backwards((s), &(i)); (e); (e) = set_iterate_backwards((s), &(i)))
+
+DEFINE_TRIVIAL_CLEANUP_FUNC(Set*, set_free);
+DEFINE_TRIVIAL_CLEANUP_FUNC(Set*, set_free_free);
+#define _cleanup_set_free_ _cleanup_(set_freep)
+#define _cleanup_set_free_free_ _cleanup_(set_free_freep)