chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit: record inactive enter/exit timestamps to facilitate syslog lookups
[elogind.git]
/
set.c
diff --git
a/set.c
b/set.c
index b94ea447f06a8b1f42d80390d8559fbfd706d746..efd20db536bda44c6b3e22c6d6f4ceaf9f102d6e 100644
(file)
--- a/
set.c
+++ b/
set.c
@@
-19,10
+19,6
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdlib.h>
#include "set.h"
#include <stdlib.h>
#include "set.h"
@@
-61,6
+57,10
@@
void *set_remove(Set *s, void *value) {
return hashmap_remove(MAKE_HASHMAP(s), value);
}
return hashmap_remove(MAKE_HASHMAP(s), value);
}
+int set_remove_and_put(Set *s, void *old_value, void *new_value) {
+ return hashmap_remove_and_put(MAKE_HASHMAP(s), old_value, new_value, new_value);
+}
+
unsigned set_size(Set *s) {
return hashmap_size(MAKE_HASHMAP(s));
}
unsigned set_size(Set *s) {
return hashmap_size(MAKE_HASHMAP(s));
}
@@
-97,6
+97,14
@@
int set_merge(Set *s, Set *other) {
return hashmap_merge(MAKE_HASHMAP(s), MAKE_HASHMAP(other));
}
return hashmap_merge(MAKE_HASHMAP(s), MAKE_HASHMAP(other));
}
+void set_move(Set *s, Set *other) {
+ return hashmap_move(MAKE_HASHMAP(s), MAKE_HASHMAP(other));
+}
+
+int set_move_one(Set *s, Set *other, void *value) {
+ return hashmap_move_one(MAKE_HASHMAP(s), MAKE_HASHMAP(other), value);
+}
+
Set* set_copy(Set *s) {
return MAKE_SET(hashmap_copy(MAKE_HASHMAP(s)));
}
Set* set_copy(Set *s) {
return MAKE_SET(hashmap_copy(MAKE_HASHMAP(s)));
}