diff options
author | Ana Rey <anarey@gmail.com> | 2014-06-23 11:38:17 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-23 19:47:49 +0200 |
commit | 9d62d929ef4a2d2a55e22ffee5c04ed8ba2d2856 (patch) | |
tree | 61c6a4de17b600900c3740c4bb3007ff4bcb1c9a /src/expr | |
parent | 9f75fbe0faf815be7ae1253e34e1c29917fb8350 (diff) |
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>
Diffstat (limited to 'src/expr')
-rw-r--r-- | src/expr/target.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/expr/target.c b/src/expr/target.c index 6a2b405..5245ff7 100644 --- 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; } |