expr: target: get a nft_rule_expr type in nft_rule_expr_target_snprintf_* functions

Code refactoring in nft_rule_expr_target_snprintf_* functions to get a
nft_rule_expr type instead of nft_expr_target type. The nft_rule_expr is
needed to check information into flags variables.

Moreover, It remanes some variables like 'tg' to 'target' for code
readability reasons.

Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/expr/target.c b/src/expr/target.c
index 6a2b4057cfe8f92bc4de4ec8adc0d08e62782fdc..5245ff78de7856d37ae60d8d4cd54f970d650c05 100644 (file)
--- a/src/expr/target.c
+++ b/src/expr/target.c
@@ -216,27 +216,26 @@ nft_rule_expr_target_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree,
 #endif
 }
 
-static
-int nft_rule_exp_target_snprintf_json(char *buf, size_t len,
-                               struct nft_expr_target *tg)
+static int nft_rule_exp_target_snprintf_json(char *buf, size_t len,
+                                            struct nft_rule_expr *e)
 {
+       struct nft_expr_target *target = nft_expr_data(e);
        int ret, size = len, offset = 0;
 
-       ret = snprintf(buf, len, "\"name\":\"%s\"",
-                       tg->name);
+       ret = snprintf(buf, len, "\"name\":\"%s\"", target->name);
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
        return offset;
 }
 
-static
-int nft_rule_exp_target_snprintf_xml(char *buf, size_t len,
-                               struct nft_expr_target *tg)
+static int nft_rule_exp_target_snprintf_xml(char *buf, size_t len,
+                                           struct nft_rule_expr *e)
 {
+       struct nft_expr_target *target = nft_expr_data(e);
        int ret, size=len;
        int offset = 0;
 
-       ret = snprintf(buf, len, "<name>%s</name>", tg->name);
+       ret = snprintf(buf, len, "<name>%s</name>", target->name);
        SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
        return offset;
@@ -253,9 +252,9 @@ nft_rule_expr_target_snprintf(char *buf, size_t len, uint32_t type,
                return snprintf(buf, len, "name %s rev %u ",
                                target->name, target->rev);
        case NFT_OUTPUT_XML:
-               return nft_rule_exp_target_snprintf_xml(buf, len, target);
+               return nft_rule_exp_target_snprintf_xml(buf, len, e);
        case NFT_OUTPUT_JSON:
-               return nft_rule_exp_target_snprintf_json(buf, len, target);
+               return nft_rule_exp_target_snprintf_json(buf, len, e);
        default:
                break;
        }