src: json: s/nft_jansson_value_parse_reg/nft_jansson_parse_reg/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>

diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index dc424b59d14f28321da6cae5d4ad4bf0bebf8b76..11738a754322db311d8b53afe7ee8d1687b7fbc1 100644 (file)
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -187,12 +187,12 @@ nft_rule_expr_bitwise_json_parse(struct nft_rule_expr *e, json_t *root)
        struct nft_expr_bitwise *bitwise = nft_expr_data(e);
        uint32_t reg, len;
 
-       if (nft_jansson_value_parse_reg(root, "sreg", NFT_TYPE_U32, &reg) == -1)
+       if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &reg) < 0)
                return -1;
 
        nft_rule_expr_set_u32(e, NFT_EXPR_BITWISE_SREG, reg);
 
-       if (nft_jansson_value_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) == -1)
+       if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) < 0)
                return -1;
 
        nft_rule_expr_set_u32(e, NFT_EXPR_BITWISE_DREG, reg);

diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
index 9fea753134dc41f5e99ca31f43acc8af49f7cc69..0277812033f6ccb54333780610b651b9c4d3b2e0 100644 (file)
--- a/src/expr/byteorder.c
+++ b/src/expr/byteorder.c
@@ -201,14 +201,12 @@ nft_rule_expr_byteorder_json_parse(struct nft_rule_expr *e, json_t *root)
        uint32_t uval32;
        int ntoh;
 
-       if (nft_jansson_value_parse_reg(root, "sreg", NFT_TYPE_U32,
-                                       &uval32) != 0)
+       if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &uval32) < 0)
                return -1;
 
        nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_SREG, uval32);
 
-       if (nft_jansson_value_parse_reg(root, "dreg", NFT_TYPE_U32,
-                                       &uval32) != 0)
+       if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &uval32) < 0)
                return -1;
 
        nft_rule_expr_set_u32(e, NFT_EXPR_BYTEORDER_DREG, uval32);

diff --git a/src/expr/ct.c b/src/expr/ct.c
index 78575f258cae535db44940fb1f1f7ad630e94be7..4655a96c1a5940c31da443e96f94a58460df9e01 100644 (file)
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -186,7 +186,7 @@ static int nft_rule_expr_ct_json_parse(struct nft_rule_expr *e, json_t *root)
        uint8_t dir;
        int key;
 
-       if (nft_jansson_value_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) != 0)
+       if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) < 0)
                return -1;
 
        nft_rule_expr_set_u32(e, NFT_EXPR_CT_DREG, reg);

diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
index 2c71462407101ed276ad3269c1f6f7b027ec7490..af9d6bf670ca203382a91b74602793b05b534662 100644 (file)
--- a/src/expr/exthdr.c
+++ b/src/expr/exthdr.c
@@ -200,8 +200,7 @@ nft_rule_expr_exthdr_json_parse(struct nft_rule_expr *e, json_t *root)
        uint32_t uval32;
        int type;
 
-       if (nft_jansson_value_parse_reg(root, "dreg", NFT_TYPE_U32,
-                                       &uval32) != 0)
+       if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &uval32) < 0)
                return -1;
 
        nft_rule_expr_set_u32(e, NFT_EXPR_EXTHDR_DREG, uval32);

diff --git a/src/expr/immediate.c b/src/expr/immediate.c
index d548b75ad3c32dee2bb9c148a2fd3709395b70dd..05569992555ea58c3451da30f6fcd25d769db7c2 100644 (file)
--- a/src/expr/immediate.c
+++ b/src/expr/immediate.c
@@ -185,7 +185,7 @@ nft_rule_expr_immediate_json_parse(struct nft_rule_expr *e, json_t *root)
        int datareg_type;
        uint32_t reg;
 
-       if (nft_jansson_value_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) != 0)
+       if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) < 0)
                return -1;
 
        nft_rule_expr_set_u32(e, NFT_EXPR_IMM_DREG, reg);

diff --git a/src/expr/lookup.c b/src/expr/lookup.c
index cbc4d42ff27903ff42c833698aace095e994e6c5..56ab2530ad644994edf4b74671b4d5b3f9020edb 100644 (file)
--- a/src/expr/lookup.c
+++ b/src/expr/lookup.c
@@ -155,12 +155,12 @@ nft_rule_expr_lookup_json_parse(struct nft_rule_expr *e, json_t *root)
 
        nft_rule_expr_set_str(e, NFT_EXPR_LOOKUP_SET, set_name);
 
-       if (nft_jansson_value_parse_reg(root, "sreg", NFT_TYPE_U32, &reg) != 0)
+       if (nft_jansson_parse_reg(root, "sreg", NFT_TYPE_U32, &reg) < 0)
                return -1;
 
        nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_SREG, reg);
 
-       if (nft_jansson_value_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) != 0)
+       if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) < 0)
                return -1;
 
        nft_rule_expr_set_u32(e, NFT_EXPR_LOOKUP_DREG, reg);

diff --git a/src/expr/meta.c b/src/expr/meta.c
index bbe5496664f2e33e6e8e1b2c93e676bfba84bfeb..d91456912b8bf9ee5378bf98cc8482c20929e390 100644 (file)
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
@@ -167,7 +167,7 @@ static int nft_rule_expr_meta_json_parse(struct nft_rule_expr *e, json_t *root)
        uint32_t reg;
        int key;
 
-       if (nft_jansson_value_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) != 0)
+       if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) < 0)
                 return -1;
 
        nft_rule_expr_set_u32(e, NFT_EXPR_META_DREG, reg);

diff --git a/src/expr/nat.c b/src/expr/nat.c
index 6cde333c043d193bd791dfcdbb63203588ca0ba6..1ebecda32b71a5088214abff7085f827ae9b496e 100644 (file)
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
@@ -223,26 +223,26 @@ static int nft_rule_expr_nat_json_parse(struct nft_rule_expr *e, json_t *root)
 
        nft_rule_expr_set_u32(e, NFT_EXPR_NAT_FAMILY, val32);
 
-       if (nft_jansson_value_parse_reg(root, "sreg_addr_min", NFT_TYPE_U32,
-                                       &reg) != 0)
+       if (nft_jansson_parse_reg(root, "sreg_addr_min", NFT_TYPE_U32,
+                                 &reg) < 0)
                return -1;
 
        nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_ADDR_MIN, reg);
 
-       if (nft_jansson_value_parse_reg(root, "sreg_addr_max", NFT_TYPE_U32,
-                                       &reg) != 0)
+       if (nft_jansson_parse_reg(root, "sreg_addr_max", NFT_TYPE_U32,
+                                 &reg) < 0)
                return -1;
 
        nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_ADDR_MAX, reg);
 
-       if (nft_jansson_value_parse_reg(root, "sreg_proto_min", NFT_TYPE_U32,
-                                       &reg) != 0)
+       if (nft_jansson_parse_reg(root, "sreg_proto_min", NFT_TYPE_U32,
+                                 &reg) < 0)
                return -1;
 
        nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_PROTO_MIN, reg);
 
-       if (nft_jansson_value_parse_reg(root, "sreg_proto_max", NFT_TYPE_U32,
-                                       &reg) != 0)
+       if (nft_jansson_parse_reg(root, "sreg_proto_max", NFT_TYPE_U32,
+                                 &reg) < 0)
                return -1;
 
        nft_rule_expr_set_u32(e, NFT_EXPR_NAT_REG_PROTO_MAX, reg);

diff --git a/src/expr/payload.c b/src/expr/payload.c
index 23456497b94bf724c5959a7ddbc0f58f40800398..38362c4828a141eea462b03d0e15edaadf087ec1 100644 (file)
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -201,7 +201,7 @@ nft_rule_expr_payload_json_parse(struct nft_rule_expr *e, json_t *root)
        uint32_t reg, uval32;
        int base;
 
-       if (nft_jansson_value_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) != 0)
+       if (nft_jansson_parse_reg(root, "dreg", NFT_TYPE_U32, &reg) < 0)
                return -1;
 
        nft_rule_expr_set_u32(e, NFT_EXPR_PAYLOAD_DREG, reg);

diff --git a/src/internal.h b/src/internal.h
index 3e771919fac5dab1542d77d0d00bff0d34a18169..66989621fda53c7bdffe55cde8a3dae85493b237 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -53,8 +53,7 @@ void nft_jansson_free_root(json_t *root);
 int nft_jansson_parse_family(json_t *root, void *out);
 int nft_jansson_str2num(json_t *root, const char *tag, int base, void *out,
                        enum nft_type type);
-int nft_jansson_value_parse_reg(json_t *root, const char *tag,
-                               int type, void *out);
+int nft_jansson_parse_reg(json_t *root, const char *tag, int type, void *out);
 struct nft_rule_expr *nft_jansson_expr_parse(json_t *root);
 union nft_data_reg;
 int nft_jansson_data_reg_parse(json_t *root, const char *tag,

diff --git a/src/jansson.c b/src/jansson.c
index a2ccebd1943661a2e3b53821e190df0a4104ba5a..682b74b80bff8a2134736b4660d75f7116462141 100644 (file)
--- a/src/jansson.c
+++ b/src/jansson.c
@@ -125,8 +125,7 @@ int nft_jansson_parse_family(json_t *root, void *out)
        return 0;
 }
 
-int nft_jansson_value_parse_reg(json_t *root, const char *tag, int type,
-                               void *out)
+int nft_jansson_parse_reg(json_t *root, const char *tag, int type, void *out)
 {
        if (nft_jansson_parse_val(root, tag, type, out) < 0)
                return -1;