diff mbox

[libnftnl,1/3] expr: lookup: Use nft_rule_expr_set_* in the xml parsing code

Message ID 1403630057-12996-2-git-send-email-anarey@gmail.com
State Accepted
Headers show

Commit Message

Ana Rey June 24, 2014, 5:14 p.m. UTC 
Code refactoring to use nft_rule_expr_set_* in parse functions.

Signed-off-by: Ana Rey <anarey@gmail.com>
---
 src/expr/lookup.c | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)
diff mbox

Patch

diff --git a/src/expr/lookup.c b/src/expr/lookup.c
index 1df65db..68b7345 100644
--- a/src/expr/lookup.c
+++ b/src/expr/lookup.c
@@ -194,31 +194,23 @@  nft_rule_expr_lookup_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
 			       struct nft_parse_err *err)
 {
 #ifdef XML_PARSING
-	struct nft_expr_lookup *lookup = nft_expr_data(e);
 	const char *set_name;
-	uint32_t reg;
+	uint32_t sreg, dreg;
 
 	set_name = nft_mxml_str_parse(tree, "set", MXML_DESCEND_FIRST,
 				      NFT_XML_MAND, err);
 	if (set_name == NULL)
 		return -1;
+	nft_rule_expr_set_str(e, NFT_EXPR_LOOKUP_SET, set_name);
 
-	strncpy(lookup->set_name, set_name, IFNAMSIZ);
-	lookup->set_name[IFNAMSIZ-1] = '\0';
-	e->flags |= (1 << NFT_EXPR_LOOKUP_SET);
-
-	if (nft_mxml_reg_parse(tree, "sreg", &reg, MXML_DESCEND,
+	if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND,
 			       NFT_XML_MAND, err) != 0)
 		return -1;
+	nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_SREG, sreg);
 
-	lookup->sreg = reg;
-	e->flags |= (1 << NFT_EXPR_LOOKUP_SREG);
-
-	if (nft_mxml_reg_parse(tree, "dreg", &reg, MXML_DESCEND,
-			       NFT_XML_OPT, err) == 0) {
-		lookup->dreg = reg;
-		e->flags |= (1 << NFT_EXPR_LOOKUP_DREG);
-	}
+	if (nft_mxml_reg_parse(tree, "dreg", &dreg, MXML_DESCEND,
+			       NFT_XML_OPT, err) == 0)
+		nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_DREG, dreg);
 
 	return 0;
 #else