chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tree-wide: remove Emacs lines from all files
[elogind.git]
/
src
/
basic
/
set.h
diff --git
a/src/basic/set.h
b/src/basic/set.h
index 1d16999595a96b5d74b9ef6ffed6a17cf7547512..f8e86478cb83b905b8e26f4bd744114c95c325b7 100644
(file)
--- a/
src/basic/set.h
+++ b/
src/basic/set.h
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
#pragma once
/***
#pragma once
/***
@@
-27,13
+25,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)
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));
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
+62,9
@@
static inline void *set_remove(Set *s, const void *key) {
/* no set_remove2 */
/* no set_remove_value */
/* no set_remove2 */
/* no set_remove_value */
+#if 0 /// UNNEEDED by elogind
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
+123,9
@@
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);
+#if 0 /// UNNEEDED by elogind
+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)); )