From ff16877700003eb72c3069a338fa4ed3d56ab75b Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Tue, 3 Jun 2014 12:41:54 +0200 Subject: expr: log: Rename variables in nft_rule_expr_log_json_parse functions Renames some variables for code readability reasons. Signed-off-by: Ana Rey Signed-off-by: Pablo Neira Ayuso --- src/expr/log.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/expr/log.c b/src/expr/log.c index a61a8d3..e88ee39 100644 --- a/src/expr/log.c +++ b/src/expr/log.c @@ -166,7 +166,7 @@ static int nft_rule_expr_log_json_parse(struct nft_rule_expr *e, json_t *root, #ifdef JSON_PARSING const char *prefix; uint32_t snaplen; - uint16_t uval16; + uint16_t group, qthreshold; prefix = nft_jansson_parse_str(root, "prefix", err); if (prefix == NULL) @@ -174,11 +174,11 @@ static int nft_rule_expr_log_json_parse(struct nft_rule_expr *e, json_t *root, nft_rule_expr_set_str(e, NFT_EXPR_LOG_PREFIX, prefix); - if (nft_jansson_parse_val(root, "group", NFT_TYPE_U16, &uval16, + if (nft_jansson_parse_val(root, "group", NFT_TYPE_U16, &group, err) < 0) return -1; - nft_rule_expr_set_u16(e, NFT_EXPR_LOG_GROUP, uval16); + nft_rule_expr_set_u16(e, NFT_EXPR_LOG_GROUP, group); if (nft_jansson_parse_val(root, "snaplen", NFT_TYPE_U32, &snaplen, err) < 0) @@ -187,10 +187,10 @@ static int nft_rule_expr_log_json_parse(struct nft_rule_expr *e, json_t *root, nft_rule_expr_set_u32(e, NFT_EXPR_LOG_SNAPLEN, snaplen); if (nft_jansson_parse_val(root, "qthreshold", NFT_TYPE_U16, - &uval16, err) < 0) + &qthreshold, err) < 0) return -1; - nft_rule_expr_set_u16(e, NFT_EXPR_LOG_QTHRESHOLD, uval16); + nft_rule_expr_set_u16(e, NFT_EXPR_LOG_QTHRESHOLD, qthreshold); return 0; #else -- cgit v1.2.3