From 92f891ca00e06dd99b075cdd53670127af69ab3e Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Tue, 24 Jun 2014 19:15:01 +0200 Subject: expr: match: get a nft_rule_expr type in nft_rule_expr_match_snprintf_* functions Code refactoring in nft_rule_expr_match_snprintf_* functions to get a nft_rule_expr type instead of nft_expr_match type. The nft_rule_expr type is needed to check information into flags variables. Signed-off-by: Ana Rey Signed-off-by: Pablo Neira Ayuso --- src/expr/match.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/expr/match.c b/src/expr/match.c index a78bd69..05f9aff 100644 --- a/src/expr/match.c +++ b/src/expr/match.c @@ -216,8 +216,9 @@ static int nft_rule_expr_match_xml_parse(struct nft_rule_expr *e, mxml_node_t *t } static int nft_rule_expr_match_snprintf_json(char *buf, size_t len, - struct nft_expr_match *mt) + struct nft_rule_expr *e) { + struct nft_expr_match *mt = nft_expr_data(e); int ret, size = len, offset = 0; ret = snprintf(buf, len, "\"name\":\"%s\"", @@ -228,8 +229,9 @@ static int nft_rule_expr_match_snprintf_json(char *buf, size_t len, } static int nft_rule_expr_match_snprintf_xml(char *buf, size_t len, - struct nft_expr_match *mt) + struct nft_rule_expr *e) { + struct nft_expr_match *mt = nft_expr_data(e); int ret, size=len; int offset = 0; @@ -251,9 +253,9 @@ nft_rule_expr_match_snprintf(char *buf, size_t len, uint32_t type, return snprintf(buf, len, "name %s rev %u ", match->name, match->rev); case NFT_OUTPUT_XML: - return nft_rule_expr_match_snprintf_xml(buf, len, match); + return nft_rule_expr_match_snprintf_xml(buf, len, e); case NFT_OUTPUT_JSON: - return nft_rule_expr_match_snprintf_json(buf, len, match); + return nft_rule_expr_match_snprintf_json(buf, len, e); default: break; } -- cgit v1.2.3