From 55213fd581a13f5f6af61db6002ab6e6cc284546 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 20 Nov 2009 15:39:07 -0800 Subject: [PATCH] shash: Make it more convenient to store "const" objects in an shash. --- lib/shash.c | 4 ++-- lib/shash.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/shash.c b/lib/shash.c index c35164bd..e6cb6b0d 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 c2d13b15..236d865e 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 *); -- 2.30.2