X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fshash.h;h=471918b270242681475fcfc92318011c1cd3fd81;hb=b97ba90b95c18a7b6b16fc8821b8ef3c6b61a05c;hp=bcac41b5760d2bac34f856dc2598a5e21805232f;hpb=7efc68eb075acfe3c00fbe1a8ed2146c445f1139;p=openvswitch

diff --git a/lib/shash.h b/lib/shash.h
index bcac41b5..471918b2 100644
--- a/lib/shash.h
+++ b/lib/shash.h
@@ -19,6 +19,10 @@
 
 #include "hmap.h"
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 struct shash_node {
     struct hmap_node node;
     char *name;
@@ -31,14 +35,25 @@ struct shash {
 
 #define SHASH_INITIALIZER(SHASH) { HMAP_INITIALIZER(&(SHASH)->map) }
 
+#define SHASH_FOR_EACH(SHASH_NODE, SHASH)                               \
+    HMAP_FOR_EACH (SHASH_NODE, struct shash_node, node, &(SHASH)->map)
+
+#define SHASH_FOR_EACH_SAFE(SHASH_NODE, NEXT, SHASH)                \
+    HMAP_FOR_EACH_SAFE (SHASH_NODE, NEXT, struct shash_node, node,  \
+                        &(SHASH)->map)
+
 void shash_init(struct shash *);
 void shash_destroy(struct shash *);
 void shash_clear(struct shash *);
 bool shash_is_empty(const struct shash *);
-void shash_add(struct shash *, const char *, void *);
+struct shash_node *shash_add(struct shash *, const char *, void *);
 void shash_delete(struct shash *, struct shash_node *);
 struct shash_node *shash_find(const struct shash *, const char *);
 void *shash_find_data(const struct shash *, const char *);
 struct shash_node *shash_first(const struct shash *);
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif /* shash.h */