chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v228: Substitute declaration masks (2/4)
[elogind.git]
/
src
/
basic
/
set.h
diff --git
a/src/basic/set.h
b/src/basic/set.h
index 1d16999595a96b5d74b9ef6ffed6a17cf7547512..ae02f4fe2aaadc972551b8630f7f24e0f3fd8060 100644
(file)
--- 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)
#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));
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));
internal_hashmap_free_free(HASHMAP_BASE(s));
+ return NULL;
}
/* no set_free_free_free */
}
/* no set_free_free_free */
@@
-63,7
+65,10
@@
static inline void *set_remove(Set *s, const void *key) {
/* no set_remove2 */
/* no set_remove_value */
/* no set_remove2 */
/* no set_remove_value */
+/// UNNEEDED by elogind
+#if 0
int set_remove_and_put(Set *s, const void *old_key, const void *new_key);
int set_remove_and_put(Set *s, const void *old_key, const void *new_key);
+#endif // 0
/* no set_remove_and_replace */
int set_merge(Set *s, Set *other);
/* no set_remove_and_replace */
int set_merge(Set *s, Set *other);
@@
-122,7
+127,10
@@
static inline char **set_get_strv(Set *s) {
int set_consume(Set *s, void *value);
int set_put_strdup(Set *s, const char *p);
int set_consume(Set *s, void *value);
int set_put_strdup(Set *s, const char *p);
-// UNNEEDED int set_put_strdupv(Set *s, char **l);
+/// UNNEEDED by elogind
+#if 0
+int set_put_strdupv(Set *s, char **l);
+#endif // 0
#define SET_FOREACH(e, s, i) \
for ((i) = ITERATOR_FIRST; set_iterate((s), &(i), (void**)&(e)); )
#define SET_FOREACH(e, s, i) \
for ((i) = ITERATOR_FIRST; set_iterate((s), &(i), (void**)&(e)); )