git://git.onelab.eu
/
sliver-openvswitch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3b7c608
)
shash: Make shash_add() return the new node.
author
Ben Pfaff
<blp@nicira.com>
Tue, 28 Jul 2009 20:29:57 +0000
(13:29 -0700)
committer
Ben Pfaff
<blp@nicira.com>
Thu, 30 Jul 2009 23:07:13 +0000
(16:07 -0700)
lib/shash.c
patch
|
blob
|
history
lib/shash.h
patch
|
blob
|
history
diff --git
a/lib/shash.c
b/lib/shash.c
index
9316372
..
f178513
100644
(file)
--- 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);
}
return hmap_is_empty(&shash->map);
}
-/* It is the caller's responsib
le
to avoid duplicate names, if that is
+/* It is the caller's responsib
ility
to avoid duplicate names, if that is
* desirable. */
* 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));
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
}
void
diff --git
a/lib/shash.h
b/lib/shash.h
index
bcac41b
..
72d8302
100644
(file)
--- 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_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 *);
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 *);