From: Ben Pfaff <blp@nicira.com>
Date: Fri, 20 Nov 2009 23:39:07 +0000 (-0800)
Subject: shash: Make it more convenient to store "const" objects in an shash.
X-Git-Tag: v1.0.0~259^2~487
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=55213fd581a13f5f6af61db6002ab6e6cc284546;p=sliver-openvswitch.git

shash: Make it more convenient to store "const" objects in an shash.
---

diff --git a/lib/shash.c b/lib/shash.c
index c35164bd9..e6cb6b0db 100644
--- a/lib/shash.c
+++ b/lib/shash.c
@@ -67,11 +67,11 @@ shash_count(const struct shash *shash)
 /* It is the caller's responsibility to avoid duplicate names, if that is
  * desirable. */
 struct shash_node *
-shash_add(struct shash *sh, const char *name, void *data)
+shash_add(struct shash *sh, const char *name, const void *data)
 {
     struct shash_node *node = xmalloc(sizeof *node);
     node->name = xstrdup(name);
-    node->data = data;
+    node->data = (void *) data;
     hmap_insert(&sh->map, &node->node, hash_name(name));
     return node;
 }
diff --git a/lib/shash.h b/lib/shash.h
index c2d13b157..236d865ed 100644
--- a/lib/shash.h
+++ b/lib/shash.h
@@ -43,7 +43,7 @@ void shash_destroy(struct shash *);
 void shash_clear(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 *, void *);
+struct shash_node *shash_add(struct shash *, const char *, const 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 *);