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/expr/counter.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/expr/counter.c') 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); -- cgit v1.2.3