From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 14 May 2014 22:43:44 +0000 (+0200)
Subject: hashmap: add hashmap_remove2() to remove item from hashtable and return both value... 
X-Git-Tag: v213~169
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c582a3b3e8d263defbda98ecff793431a4cffa93

hashmap: add hashmap_remove2() to remove item from hashtable and return both value and key
---

diff --git a/src/shared/hashmap.c b/src/shared/hashmap.c
index 65b7b7412..5c3efa8dd 100644
--- a/src/shared/hashmap.c
+++ b/src/shared/hashmap.c
@@ -582,6 +582,34 @@ void* hashmap_remove(Hashmap *h, const void *key) {
         return data;
 }
 
+void* hashmap_remove2(Hashmap *h, const void *key, void **rkey) {
+        struct hashmap_entry *e;
+        unsigned hash;
+        void *data;
+
+        if (!h) {
+                if (rkey)
+                        *rkey = NULL;
+                return NULL;
+        }
+
+        hash = bucket_hash(h, key);
+        e = hash_scan(h, hash, key);
+        if (!e) {
+                if (rkey)
+                        *rkey = NULL;
+                return NULL;
+        }
+
+        data = e->value;
+        if (rkey)
+                *rkey = (void*) e->key;
+
+        remove_entry(h, e);
+
+        return data;
+}
+
 int hashmap_remove_and_put(Hashmap *h, const void *old_key, const void *new_key, void *value) {
         struct hashmap_entry *e;
         unsigned old_hash, new_hash;
diff --git a/src/shared/hashmap.h b/src/shared/hashmap.h
index 154f68eaf..bfad97007 100644
--- a/src/shared/hashmap.h
+++ b/src/shared/hashmap.h
@@ -69,6 +69,7 @@ void *hashmap_get(Hashmap *h, const void *key);
 void *hashmap_get2(Hashmap *h, const void *key, void **rkey);
 bool hashmap_contains(Hashmap *h, const void *key);
 void *hashmap_remove(Hashmap *h, const void *key);
+void *hashmap_remove2(Hashmap *h, const void *key, void **rkey);
 void *hashmap_remove_value(Hashmap *h, const void *key, void *value);
 int hashmap_remove_and_put(Hashmap *h, const void *old_key, const void *new_key, void *value);
 int hashmap_remove_and_replace(Hashmap *h, const void *old_key, const void *new_key, void *value);