[ovs-dev] [QoS v2 16/17] shash: New functions shash_destroy_free_data() and shash_clear_free_data().

[Justin Pettit]

Looks good.

--Justin


On Jun 8, 2010, at 1:41 PM, Ben Pfaff wrote:

> ---
> lib/shash.c |   24 ++++++++++++++++++++++++
> lib/shash.h |    2 ++
> 2 files changed, 26 insertions(+), 0 deletions(-)
> 
> diff --git a/lib/shash.c b/lib/shash.c
> index 1a85b79..c4d3ccb 100644
> --- a/lib/shash.c
> +++ b/lib/shash.c
> @@ -40,6 +40,16 @@ shash_destroy(struct shash *sh)
>     }
> }
> 
> +/* Like shash_destroy(), but also free() each node's 'data'. */
> +void
> +shash_destroy_free_data(struct shash *sh)
> +{
> +    if (sh) {
> +        shash_clear_free_data(sh);
> +        hmap_destroy(&sh->map);
> +    }
> +}
> +
> void
> shash_swap(struct shash *a, struct shash *b)
> {
> @@ -64,6 +74,20 @@ shash_clear(struct shash *sh)
>     }
> }
> 
> +/* Like shash_clear(), but also free() each node's 'data'. */
> +void
> +shash_clear_free_data(struct shash *sh)
> +{
> +    struct shash_node *node, *next;
> +
> +    SHASH_FOR_EACH_SAFE (node, next, sh) {
> +        hmap_remove(&sh->map, &node->node);
> +        free(node->data);
> +        free(node->name);
> +        free(node);
> +    }
> +}
> +
> bool
> shash_is_empty(const struct shash *shash)
> {
> diff --git a/lib/shash.h b/lib/shash.h
> index de85045..f97e661 100644
> --- a/lib/shash.h
> +++ b/lib/shash.h
> @@ -44,9 +44,11 @@ struct shash {
> 
> void shash_init(struct shash *);
> void shash_destroy(struct shash *);
> +void shash_destroy_free_data(struct shash *);
> void shash_swap(struct shash *, struct shash *);
> void shash_moved(struct shash *);
> void shash_clear(struct shash *);
> +void shash_clear_free_data(struct shash *);
> bool shash_is_empty(const struct shash *);
> size_t shash_count(const struct shash *);
> struct shash_node *shash_add(struct shash *, const char *, const void *);
> -- 
> 1.7.1
> 
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev_openvswitch.org