From d844fa06e43bc80487acfe5647cef4d4994c95fd Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Thu, 4 Jul 2013 14:50:22 +0200 Subject: src: consolidate XML parsing of expressions via nft_mxml_expr_parse Move common code for XML parsing of expressions to the new nft_mxml_expr_parse function. This patch reduces the XML parsing code in 300 LOC. Signed-off-by: Pablo Neira Ayuso --- src/expr/match.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'src/expr/match.c') diff --git a/src/expr/match.c b/src/expr/match.c index 7d0f078..3302bb4 100644 --- a/src/expr/match.c +++ b/src/expr/match.c @@ -184,28 +184,12 @@ static int nft_rule_expr_match_parse(struct nft_rule_expr *e, struct nlattr *att return 0; } -static int nft_rule_expr_match_xml_parse(struct nft_rule_expr *e, char *xml) +static int nft_rule_expr_match_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree) { #ifdef XML_PARSING struct nft_expr_match *mt = (struct nft_expr_match *)e->data; - mxml_node_t *tree = NULL; mxml_node_t *node = NULL; - /* load the tree */ - tree = mxmlLoadString(NULL, xml, MXML_OPAQUE_CALLBACK); - if (tree == NULL) - return -1; - - if (mxmlElementGetAttr(tree, "type") == NULL) { - mxmlDelete(tree); - return -1; - } - - if (strcmp("match", mxmlElementGetAttr(tree, "type")) != 0) { - mxmlDelete(tree); - return -1; - } - /* get and set . Not mandatory */ node = mxmlFindElement(tree, tree, "name", NULL, NULL, MXML_DESCEND_FIRST); @@ -218,7 +202,6 @@ static int nft_rule_expr_match_xml_parse(struct nft_rule_expr *e, char *xml) /* mt->info is ignored until other solution is reached */ - mxmlDelete(tree); return 0; #else errno = EOPNOTSUPP; -- cgit v1.2.3