expr: Fix compilation with JSON and XML parsing enabled

Fix missing/incorrect variables.
Also remove unsed variables to avoid warnings.

Signed-off-by: Vijay Subramanian <subramanian.vijay@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/expr/dup.c b/src/expr/dup.c
index d0fa35fd5a9e0db4aae3cb447bfe07da24547746..046751e4f8729d21ad9d2b30d7180d4740811025 100644 (file)
--- a/src/expr/dup.c
+++ b/src/expr/dup.c
@@ -115,18 +115,16 @@ static int nftnl_expr_dup_json_parse(struct nftnl_expr *e, json_t *root,
                                     struct nftnl_parse_err *err)
 {
 #ifdef JSON_PARSING
-       struct nftnl_expr_dup *dup = nftnl_expr_data(e);
        uint32_t sreg_addr, sreg_dev;
-       int datareg_type;
+       int ret;
 
-       ret = nftnl_jansson_parse_val(root, "sreg_addr", NFT_TYPE_U32, &sreg_addr, err);
+       ret = nftnl_jansson_parse_val(root, "sreg_addr", NFTNL_TYPE_U32, &sreg_addr, err);
        if (ret >= 0)
                nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_DEV, sreg_addr);
-       ret = nftnl_jansson_parse_val(root, "sreg_dev", NFT_TYPE_U32, &sreg_dev, err);
+       ret = nftnl_jansson_parse_val(root, "sreg_dev", NFTNL_TYPE_U32, &sreg_dev, err);
        if (ret >= 0)
                nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_DEV, sreg_dev);
 
-
        return 0;
 #else
        errno = EOPNOTSUPP;
@@ -138,14 +136,13 @@ static int nftnl_expr_dup_xml_parse(struct nftnl_expr *e, mxml_node_t *tree,
                                    struct nftnl_parse_err *err)
 {
 #ifdef XML_PARSING
-       struct nftnl_expr_dup *dup = nftnl_expr_data(e);
        uint32_t sreg_addr, sreg_dev;
 
        if (nftnl_mxml_reg_parse(tree, "sreg_addr", &sreg_addr, MXML_DESCEND_FIRST,
-                              NFT_XML_OPT, err) == 0)
+                              NFTNL_XML_OPT, err) == 0)
                nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_ADDR, sreg_addr);
        if (nftnl_mxml_reg_parse(tree, "sreg_dev", &sreg_dev, MXML_DESCEND_FIRST,
-                              NFT_XML_OPT, err) == 0)
+                              NFTNL_XML_OPT, err) == 0)
                nftnl_expr_set_u32(e, NFTNL_EXPR_DUP_SREG_DEV, sreg_dev);
 
        return 0;

diff --git a/src/expr/limit.c b/src/expr/limit.c
index ef7c17f1460c4949f2ac5a66719b0d63301bf8f0..ab9ceffa98fb1b5500764e54e75ff0f11f2a10d6 100644 (file)
--- a/src/expr/limit.c
+++ b/src/expr/limit.c
@@ -189,7 +189,7 @@ static int nftnl_expr_limit_xml_parse(struct nftnl_expr *e,
                               &burst, NFTNL_TYPE_U32, NFTNL_XML_MAND, err) == 0)
                nftnl_expr_set_u32(e, NFTNL_EXPR_LIMIT_BURST, burst);
        if (nftnl_mxml_num_parse(tree, "type", MXML_DESCEND_FIRST, BASE_DEC,
-                              &burst, NFT_TYPE_U32, NFTNL_XML_MAND, err) == 0)
+                              &type, NFTNL_TYPE_U32, NFTNL_XML_MAND, err) == 0)
                nftnl_expr_set_u32(e, NFTNL_EXPR_LIMIT_TYPE, type);
 
        return 0;