diff options
| author | Ana Rey <anarey@gmail.com> | 2014-06-19 17:07:09 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-06-23 19:52:04 +0200 |
| commit | 6423a2e2a5257334a5408eb183992bc701a719d4 (patch) | |
| tree | d943d3f7fc35f585ca7ab55b07561551a5978c32 | |
| parent | 199c2d597c6eb9a9f5603a1051f6c70c0a350a02 (diff) | |
expr: byteorder: Rename variables in nft_rule_expr_byteorder_json_parse functions
Renames some variables for code readability reasons.
Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/expr/byteorder.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c index 00e6b9c..9372d30 100644 --- a/src/expr/byteorder.c +++ b/src/expr/byteorder.c @@ -199,18 +199,18 @@ nft_rule_expr_byteorder_json_parse(struct nft_rule_expr *e, json_t *root, { #ifdef JSON_PARSING const char *op; - uint32_t uval32; + uint32_t sreg, dreg, len, size; int ntoh; - if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &uval32, err) < 0) + if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &sreg, err) < 0) return -1; - nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SREG, uval32); + nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SREG, sreg); - if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &uval32, err) < 0) + if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &dreg, err) < 0) return -1; - nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_DREG, uval32); + nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_DREG, dreg); op = nft_jansson_parse_str(root, "op", err); if (op == NULL) @@ -222,15 +222,15 @@ nft_rule_expr_byteorder_json_parse(struct nft_rule_expr *e, json_t *root, nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_OP, ntoh); - if (nft_jansson_parse_val(root, "len", NFT_TYPE_U32, &uval32, err) < 0) + if (nft_jansson_parse_val(root, "len", NFT_TYPE_U32, &len, err) < 0) return -1; - nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_LEN, uval32); + nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_LEN, len); - if (nft_jansson_parse_val(root, "size", NFT_TYPE_U32, &uval32, err) < 0) + if (nft_jansson_parse_val(root, "size", NFT_TYPE_U32, &size, err) < 0) return -1; - nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SIZE, uval32); + nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SIZE, size); return 0; #else |