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 <anarey@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/expr/match.c b/src/expr/match.c
index a78bd69b81804a9cf8efab90855e5fa7ab3f0305..05f9affbf96e44b70a5b9ae665344eb688ba75c9 100644 (file)
--- 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;
        }