shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-11 20:58:27 +03:00
Code

shared: introduce _cleanup_set_free_free_

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-01-28 19:36:48 -05:00
parent 01233fc712
commit e3ded78be7
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/shared/macro.h
View File

@ -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) \

8
src/shared/set.c
View File

@ -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);
}

1
src/shared/set.h
View File

@ -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);