[ovs-discuss] [abstract-netdev v2 01/21] shash: Make shash_add() return the new node.

Ben Pfaff blp at nicira.com
Tue Jul 28 21:13:27 UTC 2009


---
 lib/shash.c |    5 +++--
 lib/shash.h |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/shash.c b/lib/shash.c
index 9316372..f178513 100644
--- a/lib/shash.c
+++ b/lib/shash.c
@@ -57,15 +57,16 @@ shash_is_empty(const struct shash *shash)
     return hmap_is_empty(&shash->map);
 }
 
-/* It is the caller's responsible to avoid duplicate names, if that is
+/* It is the caller's responsibility to avoid duplicate names, if that is
  * desirable. */
-void
+struct shash_node *
 shash_add(struct shash *sh, const char *name, void *data)
 {
     struct shash_node *node = xmalloc(sizeof *node);
     node->name = xstrdup(name);
     node->data = data;
     hmap_insert(&sh->map, &node->node, hash_name(name));
+    return node;
 }
 
 void
diff --git a/lib/shash.h b/lib/shash.h
index bcac41b..72d8302 100644
--- a/lib/shash.h
+++ b/lib/shash.h
@@ -35,7 +35,7 @@ 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 *);
-- 
1.6.3.3





More information about the discuss mailing list