diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-08-24 18:08:17 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-08-24 18:28:35 +0200 |
commit | 70cbfd7ed479f36ec72ea88b45e14a94325cc465 (patch) | |
tree | 5a5f759b03693f127c6a5f78db706a03ca09108e /src/rule.c | |
parent | 3b5f75162f2307c30443f6175d37080c7f0d7e66 (diff) |
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 <pablo@netfilter.org>
Diffstat (limited to 'src/rule.c')
-rw-r--r-- | src/rule.c | 18 |
1 files changed, 8 insertions, 10 deletions
@@ -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); |