From 6ad1dab62ca3efe38709efad27ca1cd776e4ca6f Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 24 Aug 2013 18:27:58 +0200 Subject: src: json: s/nft_jansson_value_parse_reg/nft_jansson_parse_reg/g This patch is a cleanup to save LOC. I have also changed it to use < 0 to check for error conditions. Signed-off-by: Pablo Neira Ayuso --- src/expr/nat.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/expr/nat.c') diff --git a/src/expr/nat.c b/src/expr/nat.c index 6cde333..1ebecda 100644 --- a/src/expr/nat.c +++ b/src/expr/nat.c @@ -223,26 +223,26 @@ static int nft_rule_expr_nat_json_parse(struct nft_rule_expr *e, json_t *root) nft_rule_expr_set_u32(e, NFT_EXPR_NAT_FAMILY, val32); - if (nft_jansson_value_parse_reg(root, "sreg_addr_min", NFT_TYPE_U32, - ®) != 0) + if (nft_jansson_parse_reg(root, "sreg_addr_min", NFT_TYPE_U32, + ®) < 0) return -1; nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_ADDR_MIN, reg); - if (nft_jansson_value_parse_reg(root, "sreg_addr_max", NFT_TYPE_U32, - ®) != 0) + if (nft_jansson_parse_reg(root, "sreg_addr_max", NFT_TYPE_U32, + ®) < 0) return -1; nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_ADDR_MAX, reg); - if (nft_jansson_value_parse_reg(root, "sreg_proto_min", NFT_TYPE_U32, - ®) != 0) + if (nft_jansson_parse_reg(root, "sreg_proto_min", NFT_TYPE_U32, + ®) < 0) return -1; nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_PROTO_MIN, reg); - if (nft_jansson_value_parse_reg(root, "sreg_proto_max", NFT_TYPE_U32, - ®) != 0) + if (nft_jansson_parse_reg(root, "sreg_proto_max", NFT_TYPE_U32, + ®) < 0) return -1; nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_PROTO_MAX, reg); -- cgit v1.2.3