chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use @ instead = as abstract namespace socket prefix
[elogind.git]
/
set.h
diff --git
a/set.h
b/set.h
index d8ef7aa540676559fde16eafc8b3d5b8d7c70f75..a16cbedbfc8e309f8a841df506779f9b439cf1de 100644
(file)
--- a/
set.h
+++ b/
set.h
@@
-14,8
+14,9
@@
typedef struct Set Set;
Set *set_new(hash_func_t hash_func, compare_func_t compare_func);
typedef struct Set Set;
Set *set_new(hash_func_t hash_func, compare_func_t compare_func);
-Set* set_copy(Set *s);
void set_free(Set* s);
void set_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_put(Set *s, void *value);
int set_replace(Set *s, void *value);
int set_put(Set *s, void *value);
int set_replace(Set *s, void *value);
@@
-27,18
+28,19
@@
int set_merge(Set *s, Set *other);
unsigned set_size(Set *s);
bool set_isempty(Set *s);
unsigned set_size(Set *s);
bool set_isempty(Set *s);
-void *set_iterate(Set *s, void **state);
-void *set_iterate_backwards(Set *s, void **state);
+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_steal_first(Set *s);
void* set_first(Set *s);
void* set_last(Set *s);
void set_clear(Set *s);
void *set_steal_first(Set *s);
void* set_first(Set *s);
void* set_last(Set *s);
-#define SET_FOREACH(e, s,
state
) \
- for ((
state) = NULL, (e) = set_iterate((s), &(state)); (e); (e) = set_iterate((s), &(state
)))
+#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,
state
) \
- for ((
state) = NULL, (e) = set_iterate_backwards((s), &(state)); (e); (e) = set_iterate_backwards((s), &(state
)))
+#define SET_FOREACH_BACKWARDS(e, s,
i
) \
+ for ((
i) = ITERATOR_LAST, (e) = set_iterate_backwards((s), &(i)); (e); (e) = set_iterate_backwards((s), &(i
)))
#endif
#endif