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/chain.c | 13 +++++-------- src/expr/bitwise.c | 2 +- src/expr/byteorder.c | 6 ++---- src/expr/cmp.c | 3 +-- src/expr/counter.c | 6 ++---- src/expr/ct.c | 3 +-- src/expr/data_reg.c | 3 +-- src/expr/exthdr.c | 6 ++---- src/expr/limit.c | 6 ++---- src/expr/log.c | 10 ++++------ src/expr/payload.c | 6 ++---- src/internal.h | 3 +-- src/jansson.c | 5 ++--- src/rule.c | 18 ++++++++---------- src/table.c | 7 +++---- 15 files changed, 37 insertions(+), 60 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); diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c index 8cea075..dc424b5 100644 --- a/src/expr/bitwise.c +++ b/src/expr/bitwise.c @@ -197,7 +197,7 @@ nft_rule_expr_bitwise_json_parse(struct nft_rule_expr *e, json_t *root) nft_rule_expr_set_u32(e, NFT_EXPR_BITWISE_DREG, reg); - if (nft_jansson_value_parse_val(root, "len", NFT_TYPE_U32, &len) == -1) + if (nft_jansson_parse_val(root, "len", NFT_TYPE_U32, &len) < 0) return -1; nft_rule_expr_set_u32(e, NFT_EXPR_BITWISE_LEN, len); diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c index dab9061..9fea753 100644 --- a/src/expr/byteorder.c +++ b/src/expr/byteorder.c @@ -223,14 +223,12 @@ nft_rule_expr_byteorder_json_parse(struct nft_rule_expr *e, json_t *root) nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_OP, ntoh); - if (nft_jansson_value_parse_val(root, "len", NFT_TYPE_U32, - &uval32) != 0) + if (nft_jansson_parse_val(root, "len", NFT_TYPE_U32, &uval32) < 0) return -1; nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_LEN, uval32); - if (nft_jansson_value_parse_val(root, "size", NFT_TYPE_U32, - &uval32) != 0) + if (nft_jansson_parse_val(root, "size", NFT_TYPE_U32, &uval32) < 0) return -1; nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SIZE, uval32); diff --git a/src/expr/cmp.c b/src/expr/cmp.c index 71f8e60..543f774 100644 --- a/src/expr/cmp.c +++ b/src/expr/cmp.c @@ -182,8 +182,7 @@ static int nft_rule_expr_cmp_json_parse(struct nft_rule_expr *e, json_t *root) uint32_t uval32; int base; - if (nft_jansson_value_parse_val(root, "sreg", NFT_TYPE_U32, - &uval32) != 0) + if (nft_jansson_parse_val(root, "sreg", NFT_TYPE_U32, &uval32) < 0) return -1; nft_rule_expr_set_u32(e, NFT_EXPR_CMP_SREG, uval32); 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); diff --git a/src/expr/ct.c b/src/expr/ct.c index 79c4f05..78575f2 100644 --- a/src/expr/ct.c +++ b/src/expr/ct.c @@ -205,8 +205,7 @@ static int nft_rule_expr_ct_json_parse(struct nft_rule_expr *e, json_t *root) } if (nft_jansson_node_exist(root, "dir")) { - if (nft_jansson_value_parse_val(root, "dir", NFT_TYPE_U8, - &dir) != 0) + if (nft_jansson_parse_val(root, "dir", NFT_TYPE_U8, &dir) < 0) return -1; if (dir != IP_CT_DIR_ORIGINAL && dir != IP_CT_DIR_REPLY) diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c index 3b6a87a..34537a7 100644 --- a/src/expr/data_reg.c +++ b/src/expr/data_reg.c @@ -60,8 +60,7 @@ static int nft_data_reg_value_json_parse(union nft_data_reg *reg, json_t *data) int i; char node_name[6]; - if (nft_jansson_value_parse_val(data, "len", NFT_TYPE_U8, - ®->len) != 0) + if (nft_jansson_parse_val(data, "len", NFT_TYPE_U8, ®->len) < 0) return -1; for (i = 0; i < div_round_up(reg->len, sizeof(uint32_t)); i++) { diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c index b0705b5..2c71462 100644 --- a/src/expr/exthdr.c +++ b/src/expr/exthdr.c @@ -216,14 +216,12 @@ nft_rule_expr_exthdr_json_parse(struct nft_rule_expr *e, json_t *root) nft_rule_expr_set_u32(e, NFT_EXPR_EXTHDR_TYPE, type); - if (nft_jansson_value_parse_val(root, "offset", NFT_TYPE_U32, - &uval32) != 0) + if (nft_jansson_parse_val(root, "offset", NFT_TYPE_U32, &uval32) < 0) return -1; nft_rule_expr_set_u32(e, NFT_EXPR_EXTHDR_OFFSET, uval32); - if (nft_jansson_value_parse_val(root, "len", NFT_TYPE_U32, - &uval32) != 0) + if (nft_jansson_parse_val(root, "len", NFT_TYPE_U32, &uval32) < 0) return -1; nft_rule_expr_set_u32(e, NFT_EXPR_EXTHDR_LEN, uval32); diff --git a/src/expr/limit.c b/src/expr/limit.c index d65c0a9..bd92cd1 100644 --- a/src/expr/limit.c +++ b/src/expr/limit.c @@ -123,14 +123,12 @@ static int nft_rule_expr_limit_json_parse(struct nft_rule_expr *e, json_t *root) #ifdef JSON_PARSING uint64_t uval64; - if (nft_jansson_value_parse_val(root, "rate", NFT_TYPE_U64, - &uval64) != 0) + if (nft_jansson_parse_val(root, "rate", NFT_TYPE_U64, &uval64) < 0) return -1; nft_rule_expr_set_u64(e, NFT_EXPR_LIMIT_RATE, uval64); - if (nft_jansson_value_parse_val(root, "depth", NFT_TYPE_U64, - &uval64) != 0) + if (nft_jansson_parse_val(root, "depth", NFT_TYPE_U64, &uval64) < 0) return -1; nft_rule_expr_set_u64(e, NFT_EXPR_LIMIT_DEPTH, uval64); 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); diff --git a/src/expr/payload.c b/src/expr/payload.c index 161b0d9..2345649 100644 --- a/src/expr/payload.c +++ b/src/expr/payload.c @@ -216,14 +216,12 @@ nft_rule_expr_payload_json_parse(struct nft_rule_expr *e, json_t *root) nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_BASE, base); - if (nft_jansson_value_parse_val(root, "offset", NFT_TYPE_U32, - &uval32) != 0) + if (nft_jansson_parse_val(root, "offset", NFT_TYPE_U32, &uval32) < 0) return -1; nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_OFFSET, uval32); - if (nft_jansson_value_parse_val(root, "len", NFT_TYPE_U32, - &uval32) != 0) + if (nft_jansson_parse_val(root, "len", NFT_TYPE_U32, &uval32) < 0) return -1; nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_LEN, uval32); diff --git a/src/internal.h b/src/internal.h index e614a67..3e77191 100644 --- a/src/internal.h +++ b/src/internal.h @@ -44,8 +44,7 @@ int nft_mxml_set_elem_parse(mxml_node_t *node, struct nft_set_elem *e); #ifdef JSON_PARSING #include -int nft_jansson_value_parse_val(json_t *root, const char *tag, - int type, void *out); +int nft_jansson_parse_val(json_t *root, const char *tag, int type, void *out); const char *nft_jansson_parse_str(json_t *root, const char *tag); bool nft_jansson_node_exist(json_t *root, const char *tag); json_t *nft_jansson_create_root(const char *json, json_error_t *err); diff --git a/src/jansson.c b/src/jansson.c index e9a1315..a2ccebd 100644 --- a/src/jansson.c +++ b/src/jansson.c @@ -57,8 +57,7 @@ const char *nft_jansson_parse_str(json_t *root, const char *tag) return val; } -int nft_jansson_value_parse_val(json_t *root, const char *tag, int type, - void *out) +int nft_jansson_parse_val(json_t *root, const char *tag, int type, void *out) { json_int_t val; @@ -129,7 +128,7 @@ int nft_jansson_parse_family(json_t *root, void *out) int nft_jansson_value_parse_reg(json_t *root, const char *tag, int type, void *out) { - if (nft_jansson_value_parse_val(root, tag, type, out) != 0) + if (nft_jansson_parse_val(root, tag, type, out) < 0) return -1; if (*((uint32_t *)out) > NFT_REG_MAX){ diff --git a/src/rule.c b/src/rule.c index 432637a..2344dd6 100644 --- a/src/rule.c +++ b/src/rule.c @@ -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); diff --git a/src/table.c b/src/table.c index 6fb22c3..8d20be5 100644 --- a/src/table.c +++ b/src/table.c @@ -271,7 +271,7 @@ static int nft_table_json_parse(struct nft_table *t, const char *json) #ifdef JSON_PARSING json_t *root, *node; json_error_t error; - uint32_t table_flag; + uint32_t flags; const char *str; int family; @@ -294,11 +294,10 @@ static int nft_table_json_parse(struct nft_table *t, const char *json) nft_table_attr_set_u32(t, NFT_TABLE_ATTR_FAMILY, family); - if (nft_jansson_value_parse_val(root, "flags", - NFT_TYPE_U32, &table_flag) == -1) + if (nft_jansson_parse_val(root, "flags", NFT_TYPE_U32, &flags) < 0) goto err; - nft_table_attr_set_u32(t, NFT_TABLE_ATTR_FLAGS, table_flag); + nft_table_attr_set_u32(t, NFT_TABLE_ATTR_FLAGS, flags); nft_jansson_free_root(node); return 0; -- cgit v1.2.3