mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-04 08:15:25 +00:00
Code Issues Releases Wiki Activity

shash: New function shash_find_and_delete().

Browse Source
This commit is contained in:
Ben Pfaff
2009-10-28 11:10:36 -07:00
parent 3adb8bf048
commit 837e80977c
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/shash.c
View File

@@ -100,6 +100,19 @@ shash_find_data(const struct shash *sh, const char *name)
return node ? node->data : NULL; return node ? node->data : NULL;
} }
void *
shash_find_and_delete(struct shash *sh, const char *name)
{
struct shash_node *node = shash_find(sh, name);
if (node) {
void *data = node->data;
shash_delete(sh, node);
return data;
} else {
return NULL;
}
}
struct shash_node * struct shash_node *
shash_first(const struct shash *shash) shash_first(const struct shash *shash)
{ {

1
lib/shash.h
View File

@@ -46,6 +46,7 @@ struct shash_node *shash_add(struct shash *, const char *, void *);
void shash_delete(struct shash *, struct shash_node *); void shash_delete(struct shash *, struct shash_node *);
struct shash_node *shash_find(const struct shash *, const char *); struct shash_node *shash_find(const struct shash *, const char *);
void *shash_find_data(const struct shash *, const char *); void *shash_find_data(const struct shash *, const char *);
void *shash_find_and_delete(struct shash *, const char *);
struct shash_node *shash_first(const struct shash *); struct shash_node *shash_first(const struct shash *);
#endif /* shash.h */ #endif /* shash.h */