diff options
Diffstat (limited to 'src/expr/dup.c')
| -rw-r--r-- | src/expr/dup.c | 13 |
1 files changed, 5 insertions, 8 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; |