From 556fb7ee694a0f18cbd3d73ac96b27c74081bd6d Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Thu, 4 Jul 2013 16:10:24 +0200
Subject: src: consolidate XML parsing of expressions via nft_mxml_reg_parse

This patch reduces the XML code in 100 LOC.
---
 src/expr/ct.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'src/expr/ct.c')

diff --git a/src/expr/ct.c b/src/expr/ct.c
index 13da036..be23e80 100644
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -198,22 +198,15 @@ static int nft_rule_expr_ct_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree
 	struct nft_expr_ct *ct = (struct nft_expr_ct *)e->data;
 	mxml_node_t *node = NULL;
 	uint64_t tmp;
+	int32_t reg;
 	char *endptr;
 	int key;
 
-	node = mxmlFindElement(tree, tree, "dreg", NULL, NULL,
-			       MXML_DESCEND_FIRST);
-	if (node == NULL)
-		goto err;
-
-	tmp = strtoull(node->child->value.opaque, &endptr, 10);
-	if (tmp > UINT8_MAX || tmp < 0 || *endptr)
-		goto err;
-
-	if (tmp > NFT_REG_MAX)
-		goto err;
+	reg = nft_mxml_reg_parse(tree, "dreg", MXML_DESCEND_FIRST);
+	if (reg < 0)
+		return -1;
 
-	ct->dreg = tmp;
+	ct->dreg = reg;
 	e->flags |= (1 << NFT_EXPR_CT_DREG);
 
 	node = mxmlFindElement(tree, tree, "key", NULL, NULL, MXML_DESCEND);
-- 
cgit v1.2.3