X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=hashmap.h;h=ae7f74bc0494b9a6dc4b3aaf35387db2b0d24741;hb=302d0040d2571329b91dd531b670171064ec8302;hp=e3b9d9aa309d6d47f6768011b6855bfe10830a08;hpb=91cdde8a7a08c6797995cc67f4b55ac43780cdd8;p=elogind.git

diff --git a/hashmap.h b/hashmap.h
index e3b9d9aa3..ae7f74bc0 100644
--- a/hashmap.h
+++ b/hashmap.h
@@ -26,8 +26,10 @@ void hashmap_free(Hashmap *h);
 Hashmap *hashmap_copy(Hashmap *h);
 
 int hashmap_put(Hashmap *h, const void *key, void *value);
+int hashmap_replace(Hashmap *h, const void *key, void *value);
 void* hashmap_get(Hashmap *h, const void *key);
 void* hashmap_remove(Hashmap *h, const void *key);
+void* hashmap_remove_value(Hashmap *h, const void *key, void *value);
 
 int hashmap_merge(Hashmap *h, Hashmap *other);
 
@@ -37,6 +39,7 @@ bool hashmap_isempty(Hashmap *h);
 void *hashmap_iterate(Hashmap *h, void **state, const void **key);
 void *hashmap_iterate_backwards(Hashmap *h, void **state, const void **key);
 
+void hashmap_clear(Hashmap *h);
 void *hashmap_steal_first(Hashmap *h);
 void* hashmap_first(Hashmap *h);
 void* hashmap_last(Hashmap *h);
@@ -44,6 +47,9 @@ void* hashmap_last(Hashmap *h);
 #define HASHMAP_FOREACH(e, h, state) \
         for ((state) = NULL, (e) = hashmap_iterate((h), &(state), NULL); (e); (e) = hashmap_iterate((h), &(state), NULL))
 
+#define HASHMAP_FOREACH_KEY(e, k, h, state) \
+        for ((state) = NULL, (e) = hashmap_iterate((h), &(state), (const void**) &(k)); (e); (e) = hashmap_iterate((h), &(state), (const void**) &(k)))
+
 #define HASHMAP_FOREACH_BACKWARDS(e, h, state) \
         for ((state) = NULL, (e) = hashmap_iterate_backwards((h), &(state), NULL); (e); (e) = hashmap_iterate_backwards((h), &(state), NULL))