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/mxml.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/mxml.c') diff --git a/src/mxml.c b/src/mxml.c index 84514da..ed1134f 100644 --- a/src/mxml.c +++ b/src/mxml.c @@ -41,7 +41,7 @@ struct nft_rule_expr *nft_mxml_expr_parse(mxml_node_t *node) goto err_expr; tree = mxmlLoadString(NULL, xml_text, MXML_OPAQUE_CALLBACK); - free(xml_text); + xfree(xml_text); if (tree == NULL) goto err_expr; @@ -104,7 +104,7 @@ int nft_mxml_data_reg_parse(mxml_node_t *tree, const char *node_name, } ret = nft_data_reg_xml_parse(data_reg, tmpstr); - free(tmpstr); + xfree(tmpstr); if (ret < 0) { errno = EINVAL; @@ -190,18 +190,18 @@ struct nft_set_elem *nft_mxml_set_elem_parse(mxml_node_t *node) node->next = save; if (set_elem_str == NULL) { - free(elem); + xfree(elem); goto enomem; } if (nft_set_elem_parse(elem, NFT_SET_PARSE_XML, set_elem_str) != 0) { - free(set_elem_str); - free(elem); + xfree(set_elem_str); + xfree(elem); return NULL; } - free(set_elem_str); + xfree(set_elem_str); return elem; einval: -- cgit v1.2.3