X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fset.c;h=02ea8315934daed162390f70944300bc8b0759e5;hb=06b643e7f5a3b79005dd57497897ab7255fe3659;hp=53399b655b43daafe615489cdbadac8e9dfe17e9;hpb=bac3c8eefe23a820caac930d41629cebafbfc7b2;p=elogind.git diff --git a/src/shared/set.c b/src/shared/set.c index 53399b655..02ea83159 100644 --- a/src/shared/set.c +++ b/src/shared/set.c @@ -23,6 +23,7 @@ #include "set.h" #include "hashmap.h" +#include "strv.h" #define MAKE_SET(h) ((Set*) (h)) #define MAKE_HASHMAP(s) ((Hashmap*) (s)) @@ -37,14 +38,6 @@ void set_free(Set* s) { hashmap_free(MAKE_HASHMAP(s)); } -void set_freep(Set **s) { - if (!s) - return; - - set_free(*s); - *s = NULL; -} - void set_free_free(Set *s) { hashmap_free_free(MAKE_HASHMAP(s)); } @@ -57,6 +50,49 @@ int set_put(Set *s, void *value) { return hashmap_put(MAKE_HASHMAP(s), value, value); } +int set_consume(Set *s, void *value) { + int r; + + r = set_put(s, value); + if (r < 0) + free(value); + + return r; +} + +int set_put_strdup(Set *s, const char *p) { + char *c; + int r; + + assert(s); + assert(p); + + c = strdup(p); + if (!c) + return -ENOMEM; + + r = set_consume(s, c); + if (r == -EEXIST) + return 0; + + return r; +} + +int set_put_strdupv(Set *s, char **l) { + int n = 0, r; + char **i; + + STRV_FOREACH(i, l) { + r = set_put_strdup(s, *i); + if (r < 0) + return r; + + n += r; + } + + return n; +} + int set_replace(Set *s, void *value) { return hashmap_replace(MAKE_HASHMAP(s), value, value); }