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/chain.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/chain.c')
| -rw-r--r-- | src/chain.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/chain.c b/src/chain.c index 57b2284..86beb01 100644 --- a/src/chain.c +++ b/src/chain.c @@ -503,20 +503,17 @@ static int nft_chain_json_parse(struct nft_chain *c, const char *json) nft_chain_attr_set_str(c, NFT_CHAIN_ATTR_NAME, valstr); - 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_chain_attr_set_u64(c,NFT_CHAIN_ATTR_HANDLE, uval64); - if (nft_jansson_value_parse_val(root, "bytes", NFT_TYPE_U64, - &uval64) == -1) + if (nft_jansson_parse_val(root, "bytes", NFT_TYPE_U64, &uval64) < 0) goto err; nft_chain_attr_set_u64(c, NFT_CHAIN_ATTR_BYTES, uval64); - if (nft_jansson_value_parse_val(root, "packets", NFT_TYPE_U64, - &uval64) == -1) + if (nft_jansson_parse_val(root, "packets", NFT_TYPE_U64, &uval64) < 0) goto err; nft_chain_attr_set_u64(c, NFT_CHAIN_ATTR_PACKETS, uval64); @@ -541,8 +538,8 @@ static int nft_chain_json_parse(struct nft_chain *c, const char *json) nft_chain_attr_set_str(c, NFT_CHAIN_ATTR_TYPE, valstr); - if (nft_jansson_value_parse_val(root, "prio", NFT_TYPE_S32, - &val32) == -1) + if (nft_jansson_parse_val(root, "prio", NFT_TYPE_S32, + &val32) < 0) goto err; nft_chain_attr_set_s32(c, NFT_CHAIN_ATTR_PRIO, val32); |