X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fset.h;h=840ee0a7e4ed6525a55c5dbe92a22be7d291f4ba;hb=cb87a73b45503eaa6bead291423a529b00d27156;hp=e0b9c9e0a8b8c69b89459e8045c2fbb474bb4549;hpb=c0c743cb3df7197b51bb89cc3c8ca7ed16d06396;p=elogind.git diff --git a/src/shared/set.h b/src/shared/set.h index e0b9c9e0a..840ee0a7e 100644 --- a/src/shared/set.h +++ b/src/shared/set.h @@ -32,12 +32,12 @@ typedef struct Set Set; -Set *set_new(hash_func_t hash_func, compare_func_t compare_func); +Set *set_new(const struct hash_ops *hash_ops); void set_free(Set* s); void set_free_free(Set *s); Set* set_copy(Set *s); -int set_ensure_allocated(Set **s, hash_func_t hash_func, compare_func_t compare_func); +int set_ensure_allocated(Set **s, const struct hash_ops *hash_ops); int set_put(Set *s, void *value); int set_consume(Set *s, void *value); @@ -57,24 +57,18 @@ unsigned set_size(Set *s); bool set_isempty(Set *s); void *set_iterate(Set *s, Iterator *i); -void *set_iterate_backwards(Set *s, Iterator *i); -void *set_iterate_skip(Set *s, void *value, Iterator *i); void set_clear(Set *s); void set_clear_free(Set *s); void *set_steal_first(Set *s); void* set_first(Set *s); -void* set_last(Set *s); char **set_get_strv(Set *s); #define SET_FOREACH(e, s, i) \ for ((i) = ITERATOR_FIRST, (e) = set_iterate((s), &(i)); (e); (e) = set_iterate((s), &(i))) -#define SET_FOREACH_BACKWARDS(e, s, i) \ - for ((i) = ITERATOR_LAST, (e) = set_iterate_backwards((s), &(i)); (e); (e) = set_iterate_backwards((s), &(i))) - DEFINE_TRIVIAL_CLEANUP_FUNC(Set*, set_free); DEFINE_TRIVIAL_CLEANUP_FUNC(Set*, set_free_free); #define _cleanup_set_free_ _cleanup_(set_freep)