diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-01-28 19:36:48 -0500 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-01-29 19:01:41 -0500 |
commit | e3ded78be7df143ba780dd55ca8897fdddd67460 (patch) | |
tree | 6a82c7e12a003c909a667e5b26bef6a83ad8affb | |
parent | 01233fc71296bc78c2de14b755236ced752500f7 (diff) |
shared: introduce _cleanup_set_free_free_
-rw-r--r-- | src/shared/macro.h | 1 | ||||
-rw-r--r-- | src/shared/set.c | 8 | ||||
-rw-r--r-- | src/shared/set.h | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/src/shared/macro.h b/src/shared/macro.h index b307dedaa8..055919048c 100644 --- a/src/shared/macro.h +++ b/src/shared/macro.h @@ -201,6 +201,7 @@ static inline size_t IOVEC_INCREMENT(struct iovec *i, unsigned n, size_t k) { #define _cleanup_closedir_ __attribute__((cleanup(closedirp))) #define _cleanup_umask_ __attribute__((cleanup(umaskp))) #define _cleanup_set_free_ __attribute__((cleanup(set_freep))) +#define _cleanup_set_free_free_ __attribute__((cleanup(set_free_freep))) #define _cleanup_strv_free_ __attribute__((cleanup(strv_freep))) #define VA_FORMAT_ADVANCE(format, ap) \ diff --git a/src/shared/set.c b/src/shared/set.c index 53399b655b..cd910d70ab 100644 --- a/src/shared/set.c +++ b/src/shared/set.c @@ -49,6 +49,14 @@ 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); } diff --git a/src/shared/set.h b/src/shared/set.h index ed5b5a44d6..2f792585fa 100644 --- a/src/shared/set.h +++ b/src/shared/set.h @@ -35,6 +35,7 @@ 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); |