[ovs-dev] [ovsdb monitors 3/8] shash: New function shash_replace().
Ben Pfaff
blp at nicira.com
Wed Jun 30 23:49:22 UTC 2010
To be used in an upcoming commit.
---
lib/shash.c | 20 ++++++++++++++++++++
lib/shash.h | 1 +
2 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/lib/shash.c b/lib/shash.c
index e2b1fe2..1664baf 100644
--- a/lib/shash.c
+++ b/lib/shash.c
@@ -147,6 +147,26 @@ shash_add_assert(struct shash *sh, const char *name, const void *data)
assert(added);
}
+/* Searches for 'name' in 'sh'. If it does not already exist, adds it along
+ * with 'data' and returns NULL. If it does already exist, replaces its data
+ * by 'data' and returns the data that it formerly contained. */
+void *
+shash_replace(struct shash *sh, const char *name, const void *data)
+{
+ size_t hash = hash_name(name);
+ struct shash_node *node;
+
+ node = shash_find__(sh, name, hash);
+ if (!node) {
+ shash_add_nocopy__(sh, xstrdup(name), data, hash);
+ return NULL;
+ } else {
+ void *old_data = node->data;
+ node->data = (void *) data;
+ return old_data;
+ }
+}
+
void
shash_delete(struct shash *sh, struct shash_node *node)
{
diff --git a/lib/shash.h b/lib/shash.h
index f97e661..19e4c5d 100644
--- a/lib/shash.h
+++ b/lib/shash.h
@@ -55,6 +55,7 @@ struct shash_node *shash_add(struct shash *, const char *, const void *);
struct shash_node *shash_add_nocopy(struct shash *, char *, const void *);
bool shash_add_once(struct shash *, const char *, const void *);
void shash_add_assert(struct shash *, const char *, const void *);
+void *shash_replace(struct shash *, const char *, const void *data);
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.7.1
More information about the dev
mailing list