X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fset.c;h=5a4bf11bdfda45b01d4ef63ad9220c127c2daa99;hp=097b9d3aae92bb995f181f76e44ceb5d144f9082;hb=8f2665a463ffb2b822c1e3effdb292d2bddf72be;hpb=d7832d2c6e0ef5f2839a2296c1cc2fc85c7d9632 diff --git a/src/shared/set.c b/src/shared/set.c index 097b9d3aa..5a4bf11bd 100644 --- a/src/shared/set.c +++ b/src/shared/set.c @@ -6,16 +6,16 @@ Copyright 2010 Lennart Poettering systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. systemd is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see . ***/ @@ -49,6 +49,16 @@ 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_replace(Set *s, void *value) { return hashmap_replace(MAKE_HASHMAP(s), value, value); } @@ -57,6 +67,10 @@ void *set_get(Set *s, void *value) { return hashmap_get(MAKE_HASHMAP(s), value); } +bool set_contains(Set *s, void *value) { + return hashmap_contains(MAKE_HASHMAP(s), value); +} + void *set_remove(Set *s, void *value) { return hashmap_remove(MAKE_HASHMAP(s), value); } @@ -116,3 +130,11 @@ Set* set_copy(Set *s) { void set_clear(Set *s) { hashmap_clear(MAKE_HASHMAP(s)); } + +void set_clear_free(Set *s) { + hashmap_clear_free(MAKE_HASHMAP(s)); +} + +char **set_get_strv(Set *s) { + return hashmap_get_strv(MAKE_HASHMAP(s)); +}