From 70cbfd7ed479f36ec72ea88b45e14a94325cc465 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 24 Aug 2013 18:08:17 +0200 Subject: src: json: s/nft_jansson_value_parse_val/nft_jansson_parse_val/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/rule.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'src/rule.c') diff --git a/src/rule.c b/src/rule.c index 432637a..2344dd6 100644 --- a/src/rule.c +++ b/src/rule.c @@ -511,36 +511,34 @@ static int nft_rule_json_parse(struct nft_rule *r, const char *json) nft_rule_attr_set_str(r, NFT_RULE_ATTR_CHAIN, str); - if (nft_jansson_value_parse_val(root, "handle", - NFT_TYPE_U64, &uval64) == -1) + if (nft_jansson_parse_val(root, "handle", NFT_TYPE_U64, &uval64) < 0) goto err; nft_rule_attr_set_u64(r, NFT_RULE_ATTR_HANDLE, uval64); - if (nft_jansson_value_parse_val(root, "flags", - NFT_TYPE_U32, &uval32) == -1) + if (nft_jansson_parse_val(root, "flags", NFT_TYPE_U32, &uval32) < 0) goto err; nft_rule_attr_set_u32(r, NFT_RULE_ATTR_FLAGS, uval32); if (nft_jansson_node_exist(root, "compat_proto") || nft_jansson_node_exist(root, "compat_flags")) { - if (nft_jansson_value_parse_val(root, "compat_proto", - NFT_TYPE_U32, &uval32) == -1) + if (nft_jansson_parse_val(root, "compat_proto", NFT_TYPE_U32, + &uval32) < 0) goto err; nft_rule_attr_set_u32(r, NFT_RULE_ATTR_COMPAT_PROTO, uval32); - if (nft_jansson_value_parse_val(root, "compat_flags", - NFT_TYPE_U32, &uval32) == -1) + if (nft_jansson_parse_val(root, "compat_flags", NFT_TYPE_U32, + &uval32) < 0) goto err; nft_rule_attr_set_u32(r, NFT_RULE_ATTR_COMPAT_FLAGS, uval32); } if (nft_jansson_node_exist(root, "position")) { - if (nft_jansson_value_parse_val(root, "position", - NFT_TYPE_U64, &uval64) == -1) + if (nft_jansson_parse_val(root, "position", NFT_TYPE_U64, + &uval64) < 0) goto err; nft_rule_attr_set_u64(r, NFT_RULE_ATTR_POSITION, uval64); -- cgit v1.2.3