X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=set.c;h=89fd81f31bb0ef7bb2fee9ab2239c1c496bb7e39;hp=5e23c20efadaadf1ce272673c9aea5d9cc19210a;hb=fb33a393e21a15ce3b4ac8c16d947fd9b6e77206;hpb=f00b3eda2f92b2dcd13c50749ec5e7fce6720b52 diff --git a/set.c b/set.c index 5e23c20ef..89fd81f31 100644 --- a/set.c +++ b/set.c @@ -22,6 +22,10 @@ void set_free(Set* s) { hashmap_free(MAKE_HASHMAP(s)); } +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); +} + int set_put(Set *s, void *value) { return hashmap_put(MAKE_HASHMAP(s), value, value); } @@ -46,12 +50,16 @@ bool set_isempty(Set *s) { return hashmap_isempty(MAKE_HASHMAP(s)); } -void *set_iterate(Set *s, void **state) { - return hashmap_iterate(MAKE_HASHMAP(s), state, NULL); +void *set_iterate(Set *s, Iterator *i) { + return hashmap_iterate(MAKE_HASHMAP(s), i, NULL); +} + +void *set_iterate_backwards(Set *s, Iterator *i) { + return hashmap_iterate_backwards(MAKE_HASHMAP(s), i, NULL); } -void *set_iterate_backwards(Set *s, void **state) { - return hashmap_iterate_backwards(MAKE_HASHMAP(s), state, NULL); +void *set_iterate_skip(Set *s, void *value, Iterator *i) { + return hashmap_iterate_skip(MAKE_HASHMAP(s), value, i); } void *set_steal_first(Set *s) {