From 0b201ba1dd389cd61521e4de58732bc1822ff790 Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Mon, 16 Jun 2014 11:10:15 +0200 Subject: expr: limit: 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/limit.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/expr/limit.c b/src/expr/limit.c index 2ea1e4b..35b0c01 100644 --- a/src/expr/limit.c +++ b/src/expr/limit.c @@ -146,21 +146,19 @@ static int nft_rule_expr_limit_xml_parse(struct nft_rule_expr *e, struct nft_parse_err *err) { #ifdef XML_PARSING - struct nft_expr_limit *limit = nft_expr_data(e); + uint64_t rate, unit; if (nft_mxml_num_parse(tree, "rate", MXML_DESCEND_FIRST, BASE_DEC, - &limit->rate, NFT_TYPE_U64, NFT_XML_MAND, - err) != 0) + &rate, NFT_TYPE_U64, NFT_XML_MAND, + err) < 0) return -1; - - e->flags |= (1 << NFT_EXPR_LIMIT_RATE); + nft_rule_expr_set_u64(e, NFT_EXPR_LIMIT_RATE, rate); if (nft_mxml_num_parse(tree, "unit", MXML_DESCEND_FIRST, BASE_DEC, - &limit->unit, NFT_TYPE_U64, NFT_XML_MAND, - err) != 0) + &unit, NFT_TYPE_U64, NFT_XML_MAND, + err) < 0) return -1; - - e->flags |= (1 << NFT_EXPR_LIMIT_UNIT); + nft_rule_expr_set_u64(e, NFT_EXPR_LIMIT_UNIT, unit); return 0; #else -- cgit v1.2.3