From 99d25746b94b602f7b0f2381b73e0f52d11fca31 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Tue, 6 Aug 2013 11:33:45 +0200 Subject: src: add xfree and use it This patch adds xfree, a replacement of free that accepts const pointers. This helps to remove ugly castings that you usually need to calm down gcc. Signed-off-by: Pablo Neira Ayuso --- src/set_elem.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/set_elem.c') diff --git a/src/set_elem.c b/src/set_elem.c index 5325373..4e21719 100644 --- a/src/set_elem.c +++ b/src/set_elem.c @@ -42,7 +42,7 @@ EXPORT_SYMBOL(nft_set_elem_alloc); void nft_set_elem_free(struct nft_set_elem *s) { - free(s); + xfree(s); } EXPORT_SYMBOL(nft_set_elem_free); @@ -58,7 +58,7 @@ void nft_set_elem_attr_unset(struct nft_set_elem *s, uint16_t attr) case NFT_SET_ELEM_ATTR_CHAIN: if (s->flags & (1 << NFT_SET_ELEM_ATTR_CHAIN)) { if (s->data.chain) { - free(s->data.chain); + xfree(s->data.chain); s->data.chain = NULL; } } @@ -92,7 +92,7 @@ void nft_set_elem_attr_set(struct nft_set_elem *s, uint16_t attr, break; case NFT_SET_ELEM_ATTR_CHAIN: /* NFTA_SET_ELEM_DATA */ if (s->data.chain) - free(s->data.chain); + xfree(s->data.chain); s->data.chain = strdup(data); break; @@ -299,7 +299,7 @@ static int nft_set_elems_parse2(struct nft_set *s, const struct nlattr *nest) } } if (ret < 0) - free(e); + xfree(e); /* Add this new element to this set */ list_add_tail(&e->head, &s->element_list); @@ -656,6 +656,6 @@ EXPORT_SYMBOL(nft_set_elems_iter_next); void nft_set_elems_iter_destroy(struct nft_set_elems_iter *iter) { - free(iter); + xfree(iter); } EXPORT_SYMBOL(nft_set_elems_iter_destroy); -- cgit v1.2.3