diff options
| -rw-r--r-- | src/shared/hashmap.c | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/src/shared/hashmap.c b/src/shared/hashmap.c index 1eadeced5c..4c517059f6 100644 --- a/src/shared/hashmap.c +++ b/src/shared/hashmap.c @@ -488,19 +488,10 @@ static bool resize_buckets(Hashmap *h) { return true; } -int hashmap_put(Hashmap *h, const void *key, void *value) { - struct hashmap_entry *e; - unsigned hash; - - assert(h); +static int __hashmap_put(Hashmap *h, const void *key, void *value, unsigned hash) { + /* For when we know no such entry exists yet */ - hash = bucket_hash(h, key); - e = hash_scan(h, hash, key); - if (e) { - if (e->value == value) - return 0; - return -EEXIST; - } + struct hashmap_entry *e; if (resize_buckets(h)) hash = bucket_hash(h, key); @@ -521,6 +512,23 @@ int hashmap_put(Hashmap *h, const void *key, void *value) { return 1; } +int hashmap_put(Hashmap *h, const void *key, void *value) { + struct hashmap_entry *e; + unsigned hash; + + assert(h); + + hash = bucket_hash(h, key); + e = hash_scan(h, hash, key); + if (e) { + if (e->value == value) + return 0; + return -EEXIST; + } + + return __hashmap_put(h, key, value, hash); +} + int hashmap_replace(Hashmap *h, const void *key, void *value) { struct hashmap_entry *e; unsigned hash; @@ -535,7 +543,7 @@ int hashmap_replace(Hashmap *h, const void *key, void *value) { return 0; } - return hashmap_put(h, key, value); + return __hashmap_put(h, key, value, hash); } int hashmap_update(Hashmap *h, const void *key, void *value) { |