projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netdev-linux: Give tap FD to first opener.
[openvswitch]
/
lib
/
shash.c
diff --git
a/lib/shash.c
b/lib/shash.c
index 53abbe43a1ae9f62d720fefdce4b4c056ee091b5..caac460e9da9fb185be66194f61f894ce1a5ab67 100644
(file)
--- a/
lib/shash.c
+++ b/
lib/shash.c
@@
-46,6
+46,12
@@
shash_swap(struct shash *a, struct shash *b)
hmap_swap(&a->map, &b->map);
}
hmap_swap(&a->map, &b->map);
}
+void
+shash_moved(struct shash *sh)
+{
+ hmap_moved(&sh->map);
+}
+
void
shash_clear(struct shash *sh)
{
void
shash_clear(struct shash *sh)
{
@@
-93,6
+99,13
@@
shash_add_once(struct shash *sh, const char *name, const void *data)
}
}
}
}
+void
+shash_add_assert(struct shash *sh, const char *name, const void *data)
+{
+ bool added OVS_UNUSED = shash_add_once(sh, name, data);
+ assert(added);
+}
+
void
shash_delete(struct shash *sh, struct shash_node *node)
{
void
shash_delete(struct shash *sh, struct shash_node *node)
{
@@
-136,6
+149,14
@@
shash_find_and_delete(struct shash *sh, const char *name)
}
}
}
}
+void *
+shash_find_and_delete_assert(struct shash *sh, const char *name)
+{
+ void *data = shash_find_and_delete(sh, name);
+ assert(data != NULL);
+ return data;
+}
+
struct shash_node *
shash_first(const struct shash *shash)
{
struct shash_node *
shash_first(const struct shash *shash)
{