Merge "citrix" branch into "master.

[sliver-openvswitch.git] / lib / shash.c

diff --git a/lib/shash.c b/lib/shash.c
index f178513..da33fe8 100644 (file)
--- a/lib/shash.c
+++ b/lib/shash.c
@@ -36,6 +36,7 @@ shash_destroy(struct shash *sh)
 {
     if (sh) {
         shash_clear(sh);
+        hmap_destroy(&sh->map);
     }
 }
 
@@ -44,7 +45,7 @@ shash_clear(struct shash *sh)
 {
     struct shash_node *node, *next;
 
-    HMAP_FOR_EACH_SAFE (node, next, struct shash_node, node, &sh->map) {
+    SHASH_FOR_EACH_SAFE (node, next, sh) {
         hmap_remove(&sh->map, &node->node);
         free(node->name);
         free(node);