It cannot fail in the current hashmap implementation, but it may fail in alternative implementations (unless a sufficiently large reservation has been placed beforehand). --- src/shared/hashmap.c | 8 +++++--- src/shared/hashmap.h | 6 +++--- src/shared/set.c | 2 +- src/shared/set.h | 2 +- src/test/test-hashmap-plain.c | 4 ++-- 5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/shared/hashmap.c b/src/shared/hashmap.c index a11ef45..a5740df 100644 --- a/src/shared/hashmap.c +++ b/src/shared/hashmap.c @@ -815,16 +815,16 @@ int hashmap_reserve(Hashmap *h, unsigned entries_add) { return 0; } -void hashmap_move(Hashmap *h, Hashmap *other) { +int hashmap_move(Hashmap *h, Hashmap *other) { struct hashmap_entry *e, *n; assert(h); /* The same as hashmap_merge(), but every new item from other - * is moved to h. This function is guaranteed to succeed. */ + * is moved to h. */ if (!other) - return; + return 0; for (e = other->iterate_list_head; e; e = n) { unsigned h_hash, other_hash; @@ -839,6 +839,8 @@ void hashmap_move(Hashmap *h, Hashmap *other) { unlink_entry(other, e, other_hash); link_entry(h, e, h_hash); } + + return 0; } int hashmap_move_one(Hashmap *h, Hashmap *other, const void *key) { diff --git a/src/shared/hashmap.h b/src/shared/hashmap.h index 9a16eaf..df8d311 100644 --- a/src/shared/hashmap.h +++ b/src/shared/hashmap.h @@ -160,9 +160,9 @@ int hashmap_reserve(Hashmap *h, unsigned entries_add); static inline int linked_hashmap_reserve(LinkedHashmap *h, unsigned entries_add) { return hashmap_reserve((Hashmap*) h, entries_add); } -void hashmap_move(Hashmap *h, Hashmap *other); -static inline void linked_hashmap_move(LinkedHashmap *h, LinkedHashmap *other) { - hashmap_move((Hashmap*) h, (Hashmap*) other); +int hashmap_move(Hashmap *h, Hashmap *other); +static inline int linked_hashmap_move(LinkedHashmap *h, LinkedHashmap *other) { + return hashmap_move((Hashmap*) h, (Hashmap*) other); } int hashmap_move_one(Hashmap *h, Hashmap *other, const void *key); static inline int linked_hashmap_move_one(LinkedHashmap *h, LinkedHashmap *other, const void *key) { diff --git a/src/shared/set.c b/src/shared/set.c index 1a3465c..84ab82a 100644 --- a/src/shared/set.c +++ b/src/shared/set.c @@ -141,7 +141,7 @@ int set_reserve(Set *s, unsigned entries_add) { return hashmap_reserve(MAKE_HASHMAP(s), entries_add); } -void set_move(Set *s, Set *other) { +int set_move(Set *s, Set *other) { return hashmap_move(MAKE_HASHMAP(s), MAKE_HASHMAP(other)); } diff --git a/src/shared/set.h b/src/shared/set.h index 8fe071a..d2622d1 100644 --- a/src/shared/set.h +++ b/src/shared/set.h @@ -51,7 +51,7 @@ int set_remove_and_put(Set *s, void *old_value, void *new_value); int set_merge(Set *s, Set *other); int set_reserve(Set *s, unsigned entries_add); -void set_move(Set *s, Set *other); +int set_move(Set *s, Set *other); int set_move_one(Set *s, Set *other, void *value); unsigned set_size(Set *s); diff --git a/src/test/test-hashmap-plain.c b/src/test/test-hashmap-plain.c index 1c2c556..17b72a7 100644 --- a/src/test/test-hashmap-plain.c +++ b/src/test/test-hashmap-plain.c @@ -194,8 +194,8 @@ static void test_hashmap_move(void) { hashmap_put(m, "key 3", val3); hashmap_put(m, "key 4", val4); - hashmap_move(n, NULL); - hashmap_move(n, m); + assert(hashmap_move(n, NULL) == 0); + assert(hashmap_move(n, m) == 0); assert_se(hashmap_size(m) == 1); r = hashmap_get(m, "key 1"); -- 2.1.0 _______________________________________________ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel