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 18921df4271f41448b42113733506701c4a5dc8e..5612478d4e88ecf7cb3d25633a2a9b07c93a4946 100644 (file)
--- a/src/shared/set.h
+++ b/src/shared/set.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foosethfoo
-#define foosethfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -29,18 +28,22 @@
  * 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_free_free(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);
 void *set_remove(Set *s, void *value);
 int set_remove_and_put(Set *s, void *old_value, void *new_value);
 
@@ -62,10 +65,15 @@ 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)))
 
-#endif
+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)