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/log.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/log.c')
| -rw-r--r-- | src/expr/log.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/expr/log.c b/src/expr/log.c index 8858e5b..bbbd5b9 100644 --- a/src/expr/log.c +++ b/src/expr/log.c @@ -169,20 +169,18 @@ static int nft_rule_expr_log_json_parse(struct nft_rule_expr *e, json_t *root) nft_rule_expr_set_str(e, NFT_EXPR_LOG_PREFIX, prefix); - if (nft_jansson_value_parse_val(root, "group", NFT_TYPE_U16, - &uval16) != 0) + if (nft_jansson_parse_val(root, "group", NFT_TYPE_U16, &uval16) < 0) return -1; nft_rule_expr_set_u16(e, NFT_EXPR_LOG_GROUP, uval16); - if (nft_jansson_value_parse_val(root, "snaplen", NFT_TYPE_U32, - &snaplen) != 0) + if (nft_jansson_parse_val(root, "snaplen", NFT_TYPE_U32, &snaplen) < 0) return -1; nft_rule_expr_set_u32(e, NFT_EXPR_LOG_SNAPLEN, snaplen); - if (nft_jansson_value_parse_val(root, "qthreshold", NFT_TYPE_U16, - &uval16) != 0) + if (nft_jansson_parse_val(root, "qthreshold", NFT_TYPE_U16, + &uval16) < 0) return -1; nft_rule_expr_set_u16(e, NFT_EXPR_LOG_QTHRESHOLD, uval16); |