netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ana Rey <anarey@gmail.com>
To: netfilter-devel@vger.kernel.org
Cc: Ana Rey <anarey@gmail.com>
Subject: [libnftnl PATCH 2/4] expr: cmp: Use nft_rule_expr_set_* in the xml parsing code
Date: Thu, 19 Jun 2014 19:34:22 +0200	[thread overview]
Message-ID: <1403199264-14271-3-git-send-email-anarey@gmail.com> (raw)
In-Reply-To: <1403199264-14271-1-git-send-email-anarey@gmail.com>

Code refactoring to use nft_rule_expr_cmp_* in parse functions.

Signed-off-by: Ana Rey <anarey@gmail.com>
---
 src/expr/cmp.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index b21fa9d..cc01573 100644
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -218,14 +218,12 @@ static int nft_rule_expr_cmp_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre
 	struct nft_expr_cmp *cmp = nft_expr_data(e);
 	const char *op;
 	int32_t op_value;
-	uint32_t reg;
+	uint32_t sreg;
 
-	if (nft_mxml_reg_parse(tree, "sreg", &reg, MXML_DESCEND_FIRST,
+	if (nft_mxml_reg_parse(tree, "sreg", &sreg, MXML_DESCEND_FIRST,
 			       NFT_XML_MAND, err) != 0)
 		return -1;
-
-	cmp->sreg = reg;
-	e->flags |= (1 << NFT_EXPR_CMP_SREG);
+	nft_rule_expr_set_u32(e, NFT_EXPR_CMP_SREG, sreg);
 
 	op = nft_mxml_str_parse(tree, "op", MXML_DESCEND_FIRST, NFT_XML_MAND,
 				err);
@@ -235,9 +233,7 @@ static int nft_rule_expr_cmp_xml_parse(struct nft_rule_expr *e, mxml_node_t *tre
 	op_value = nft_str2cmp(op);
 	if (op_value < 0)
 		return -1;
-
-	cmp->op = op_value;
-	e->flags |= (1 << NFT_EXPR_CMP_OP);
+	nft_rule_expr_set_u32(e, NFT_EXPR_CMP_OP, op_value);
 
 	if (nft_mxml_data_reg_parse(tree, "cmpdata",
 				    &cmp->data, NFT_XML_MAND,
-- 
2.0.0


  parent reply	other threads:[~2014-06-19 17:34 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-19 17:34 [libnftnl PATCH 0/4] expr: cmp: Do not print unset values in xml and json Ana Rey
2014-06-19 17:34 ` [libnftnl PATCH 1/4] expr: cmp: Get a nft_rule_expr type in nft_rule_expr_cmp_snprintf_* functions Ana Rey
2014-06-19 17:34 ` Ana Rey [this message]
2014-06-19 17:34 ` [libnftnl PATCH 3/4] expr: cmp: Do not print unset values in xml file Ana Rey
2014-06-19 17:34 ` [libnftnl PATCH 4/4] expr: cmp: Do not print unset values in json file Ana Rey
2014-06-20  7:05 ` [libnftnl PATCH 0/4] expr: cmp: Do not print unset values in xml and json Arturo Borrero Gonzalez

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1403199264-14271-3-git-send-email-anarey@gmail.com \
    --to=anarey@gmail.com \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).