X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fshash.h;h=dfb10e2cc420e4b5e1023337178749d33db5d18b;hb=f0e167f0dbadbe2a8d684f63ad9faf68d8cb9884;hp=38d0dbbb89e4c186d45f39186574e37fb4fe5ac7;hpb=4a1ee6ae821f73c877af1548d6db9a0e04ad8eaf;p=sliver-openvswitch.git

diff --git a/lib/shash.h b/lib/shash.h
index 38d0dbbb8..dfb10e2cc 100644
--- a/lib/shash.h
+++ b/lib/shash.h
@@ -35,24 +35,28 @@ 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(SHASH_NODE, SHASH) \
+    HMAP_FOR_EACH (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)
+#define SHASH_FOR_EACH_SAFE(SHASH_NODE, NEXT, SHASH) \
+    HMAP_FOR_EACH_SAFE (SHASH_NODE, NEXT, node, &(SHASH)->map)
 
 void shash_init(struct shash *);
 void shash_destroy(struct shash *);
+void shash_destroy_free_data(struct shash *);
 void shash_swap(struct shash *, struct shash *);
 void shash_moved(struct shash *);
 void shash_clear(struct shash *);
+void shash_clear_free_data(struct shash *);
 bool shash_is_empty(const struct shash *);
 size_t shash_count(const struct shash *);
 struct shash_node *shash_add(struct shash *, const char *, const void *);
+struct shash_node *shash_add_nocopy(struct shash *, char *, const void *);
 bool shash_add_once(struct shash *, const char *, const void *);
 void shash_add_assert(struct shash *, const char *, const void *);
+void *shash_replace(struct shash *, const char *, const void *data);
 void shash_delete(struct shash *, struct shash_node *);
+char *shash_steal(struct shash *, struct shash_node *);
 struct shash_node *shash_find(const struct shash *, const char *);
 void *shash_find_data(const struct shash *, const char *);
 void *shash_find_and_delete(struct shash *, const char *);
@@ -60,6 +64,7 @@ void *shash_find_and_delete_assert(struct shash *, const char *);
 struct shash_node *shash_first(const struct shash *);
 const struct shash_node **shash_sort(const struct shash *);
 bool shash_equal_keys(const struct shash *, const struct shash *);
+struct shash_node *shash_random_node(struct shash *);
 
 #ifdef  __cplusplus
 }