X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fset.h;h=e5d46e9a8f7d0270638b1fc91cc36426c2f22807;hb=b32ff512191bf873266ee8067f6f6c8a30c96a5e;hp=c7b6231eed36ed0b9fdd66f5dd0015b8fb4ee9da;hpb=c2f1db8f83618e60dcded8303d14656d7d26b436;p=elogind.git

diff --git a/src/shared/set.h b/src/shared/set.h
index c7b6231ee..e5d46e9a8 100644
--- a/src/shared/set.h
+++ b/src/shared/set.h
@@ -33,13 +33,23 @@ typedef struct Set Set;
 
 Set *set_new(hash_func_t hash_func, compare_func_t compare_func);
 void set_free(Set* s);
+static inline void set_freep(Set **s) {
+        set_free(*s);
+}
+
 void set_free_free(Set *s);
+static inline void set_free_freep(Set **s) {
+        set_free_free(*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);
 void *set_remove(Set *s, void *value);
 int set_remove_and_put(Set *s, void *old_value, void *new_value);
 
@@ -61,8 +71,13 @@ void *set_steal_first(Set *s);
 void* set_first(Set *s);
 void* set_last(Set *s);
 
+char **set_get_strv(Set *s);
+
 #define SET_FOREACH(e, s, i) \
         for ((i) = ITERATOR_FIRST, (e) = set_iterate((s), &(i)); (e); (e) = set_iterate((s), &(i)))
 
 #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 _cleanup_set_free_ _cleanup_(set_freep)
+#define _cleanup_set_free_free_ _cleanup_(set_free_freep)