diff options
| author | Vijay Subramanian <subramanian.vijay@gmail.com> | 2015-10-09 12:21:07 -0700 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-10-12 18:03:12 +0200 |
| commit | 60e9a3b6f8b77cf0ebcb5efe857591f92ede177c (patch) | |
| tree | da2af39936bf9f5f9825604233998a2600859c5d /src | |
| parent | fbb4d955b12c87e2143994f26477be9b73a6f1d7 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/expr/dup.c | 13 | ||||
| -rw-r--r-- | src/expr/limit.c | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/expr/dup.c b/src/expr/dup.c index d0fa35f..046751e 100644 --- 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 ef7c17f..ab9ceff 100644 --- 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; |