[PATCH libnftnl] expr: dup: Fix json parsing

[PATCH libnftnl] expr: dup: Fix json parsing

[Aaron Conole]

fixes 760768890e60 ("src: rename existing functions...") by using the
correct NFTNL_TYPE_U32.
fixes 42365e5fec55 ("expr: add dup expression support...") by adding
a declaration for the ret variable.

Signed-off-by: Aaron Conole <aconole@bytheb.org>
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
---
 src/expr/dup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/expr/dup.c b/src/expr/dup.c
index d0fa35f..17957df 100644
--- a/src/expr/dup.c
+++ b/src/expr/dup.c
@@ -119,10 +119,10 @@ static int nftnl_expr_dup_json_parse(struct nftnl_expr *e, json_t *root,
 	uint32_t sreg_addr, sreg_dev;
 	int datareg_type;
 
-	ret = nftnl_jansson_parse_val(root, "sreg_addr", NFT_TYPE_U32, &sreg_addr, err);
+	int 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);
 
-- 
1.8.3.1

Re: [PATCH libnftnl] expr: dup: Fix json parsing

[Pablo Neira Ayuso]

On Thu, Oct 08, 2015 at 05:09:30PM -0400, Aaron Conole wrote:
> fixes 760768890e60 ("src: rename existing functions...") by using the
> correct NFTNL_TYPE_U32.
> fixes 42365e5fec55 ("expr: add dup expression support...") by adding
> a declaration for the ret variable.

expr/dup.c: In function 'nftnl_expr_dup_json_parse':
expr/dup.c:120:6: warning: unused variable 'datareg_type'
[-Wunused-variable]
  int datareg_type;
      ^
expr/dup.c:118:25: warning: unused variable 'dup' [-Wunused-variable]
  struct nftnl_expr_dup *dup = nftnl_expr_data(e);
                         ^