X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Fset.h;h=32daa05f79bf071a6bcb214af3050caf550f5919;hb=5382831207810d62db22b6c87f35f73ddfb30b23;hp=1d16999595a96b5d74b9ef6ffed6a17cf7547512;hpb=1cfc78c91965df340cdde100ad6cb3ed50b28927;p=elogind.git diff --git a/src/basic/set.h b/src/basic/set.h index 1d1699959..32daa05f7 100644 --- a/src/basic/set.h +++ b/src/basic/set.h @@ -28,12 +28,14 @@ Set *internal_set_new(const struct hash_ops *hash_ops HASHMAP_DEBUG_PARAMS); #define set_new(ops) internal_set_new(ops HASHMAP_DEBUG_SRC_ARGS) -static inline void set_free(Set *s) { +static inline Set *set_free(Set *s) { internal_hashmap_free(HASHMAP_BASE(s)); + return NULL; } -static inline void set_free_free(Set *s) { +static inline Set *set_free_free(Set *s) { internal_hashmap_free_free(HASHMAP_BASE(s)); + return NULL; } /* no set_free_free_free */ @@ -63,7 +65,7 @@ static inline void *set_remove(Set *s, const void *key) { /* no set_remove2 */ /* no set_remove_value */ -int set_remove_and_put(Set *s, const void *old_key, const void *new_key); +// UNNEEDED int set_remove_and_put(Set *s, const void *old_key, const void *new_key); /* no set_remove_and_replace */ int set_merge(Set *s, Set *other);