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/expr/counter.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/expr/counter.c')
-rw-r--r-- | src/expr/counter.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/expr/counter.c b/src/expr/counter.c index 6cdd637..53dc526 100644 --- a/src/expr/counter.c +++ b/src/expr/counter.c @@ -124,14 +124,12 @@ nft_rule_expr_counter_json_parse(struct nft_rule_expr *e, json_t *root) #ifdef JSON_PARSING uint64_t uval64; - if (nft_jansson_value_parse_val(root, "pkts", NFT_TYPE_U64, - &uval64) != 0) + if (nft_jansson_parse_val(root, "pkts", NFT_TYPE_U64, &uval64) < 0) return -1; nft_rule_expr_set_u64(e, NFT_EXPR_CTR_PACKETS, uval64); - if (nft_jansson_value_parse_val(root, "bytes", NFT_TYPE_U64, - &uval64) != 0) + if (nft_jansson_parse_val(root, "bytes", NFT_TYPE_U64, &uval64) < 0) return -1; nft_rule_expr_set_u64(e, NFT_EXPR_CTR_BYTES, uval64); |