From ae90b05bb6d6910338c8a7a7b8904b7828251823 Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Thu, 19 Jun 2014 17:07:06 +0200 Subject: expr: byteorder: Get a nft_rule_expr type in nft_rule_expr_byteorder_snprintf_* functions Code refactoring in nft_rule_expr_byteorder_snprintf_* functions to get a nft_rule_expr type instead of nft_expr_byorder type. Signed-off-by: Ana Rey Signed-off-by: Pablo Neira Ayuso --- src/expr/byteorder.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) (limited to 'src/expr/byteorder.c') diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c index 4889e80..e42d7b6 100644 --- a/src/expr/byteorder.c +++ b/src/expr/byteorder.c @@ -296,10 +296,10 @@ nft_rule_expr_byteorder_xml_parse(struct nft_rule_expr *e, mxml_node_t *tree, #endif } -static int -nft_rule_expr_byteorder_snprintf_json(char *buf, size_t size, - struct nft_expr_byteorder *byteorder) +static int nft_rule_expr_byteorder_snprintf_json(char *buf, size_t size, + struct nft_rule_expr *e) { + struct nft_expr_byteorder *byteorder = nft_expr_data(e); int len = size, offset = 0, ret; ret = snprintf(buf, len, "\"sreg\":%u," @@ -315,10 +315,10 @@ nft_rule_expr_byteorder_snprintf_json(char *buf, size_t size, return offset; } -static int -nft_rule_expr_byteorder_snprintf_xml(char *buf, size_t size, - struct nft_expr_byteorder *byteorder) +static int nft_rule_expr_byteorder_snprintf_xml(char *buf, size_t size, + struct nft_rule_expr *e) { + struct nft_expr_byteorder *byteorder = nft_expr_data(e); int len = size, offset = 0, ret; ret = snprintf(buf, len, "%u" @@ -334,10 +334,10 @@ nft_rule_expr_byteorder_snprintf_xml(char *buf, size_t size, return offset; } -static int -nft_rule_expr_byteorder_snprintf_default(char *buf, size_t size, - struct nft_expr_byteorder *byteorder) +static int nft_rule_expr_byteorder_snprintf_default(char *buf, size_t size, + struct nft_rule_expr *e) { + struct nft_expr_byteorder *byteorder = nft_expr_data(e); int len = size, offset = 0, ret; ret = snprintf(buf, len, "reg %u = %s(reg %u, %u, %u) ", @@ -350,20 +350,15 @@ nft_rule_expr_byteorder_snprintf_default(char *buf, size_t size, static int nft_rule_expr_byteorder_snprintf(char *buf, size_t size, uint32_t type, - uint32_t flags, struct nft_rule_expr *e) + uint32_t flags, struct nft_rule_expr *e) { - struct nft_expr_byteorder *byteorder = nft_expr_data(e); - switch(type) { case NFT_OUTPUT_DEFAULT: - return nft_rule_expr_byteorder_snprintf_default(buf, size, - byteorder); + return nft_rule_expr_byteorder_snprintf_default(buf, size, e); case NFT_OUTPUT_XML: - return nft_rule_expr_byteorder_snprintf_xml(buf, size, - byteorder); + return nft_rule_expr_byteorder_snprintf_xml(buf, size, e); case NFT_OUTPUT_JSON: - return nft_rule_expr_byteorder_snprintf_json(buf, size, - byteorder); + return nft_rule_expr_byteorder_snprintf_json(buf, size, e); default: break; } -- cgit v1.2.3