From 323efbbf90df64537a32cf9be230970b0b89d035 Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Tue, 24 Jun 2014 09:15:36 +0200 Subject: expr: counter: Use nft_rule_expr_set_* in the xml parsing code Code refactoring to use nft_rule_expr_set_* in parse functions. Signed-off-by: Ana Rey Signed-off-by: Pablo Neira Ayuso --- src/expr/counter.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/expr/counter.c b/src/expr/counter.c index 65acee3..9d85a96 100644 --- a/src/expr/counter.c +++ b/src/expr/counter.c @@ -147,21 +147,19 @@ nft_rule_expr_counter_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, struct nft_parse_err *err) { #ifdef XML_PARSING - struct nft_expr_counter *ctr = nft_expr_data(e); + uint64_t pkts, bytes; if (nft_mxml_num_parse(tree, "pkts", MXML_DESCEND_FIRST, BASE_DEC, - &ctr->pkts, NFT_TYPE_U64, NFT_XML_MAND, + &pkts, NFT_TYPE_U64, NFT_XML_MAND, err) != 0) return -1; - - e->flags |= (1 << NFT_EXPR_CTR_PACKETS); + nft_rule_expr_set_u64(e, NFT_EXPR_CTR_PACKETS, pkts); if (nft_mxml_num_parse(tree, "bytes", MXML_DESCEND_FIRST, BASE_DEC, - &ctr->bytes, NFT_TYPE_U64, NFT_XML_MAND, + &bytes, NFT_TYPE_U64, NFT_XML_MAND, err) != 0) return -1; - - e->flags |= (1 << NFT_EXPR_CTR_BYTES); + nft_rule_expr_set_u64(e, NFT_EXPR_CTR_BYTES, bytes); return 0; #else -- cgit v1.2.3