CVS commit: src/sys/net/npf

[Mindaugas Rasiukevicius]

Module Name:    src
Committed By:   rmind
Date:           Sat Jul 19 20:59:01 UTC 2014

Modified Files:
        src/sys/net/npf: npf_conn.c

Log Message:
Fix gcc warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/net/npf/npf_conn.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/net/npf/npf_conn.c
diff -u src/sys/net/npf/npf_conn.c:1.1 src/sys/net/npf/npf_conn.c:1.2
--- src/sys/net/npf/npf_conn.c:1.1	Sat Jul 19 18:24:16 2014
+++ src/sys/net/npf/npf_conn.c	Sat Jul 19 20:59:01 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_conn.c,v 1.1 2014/07/19 18:24:16 rmind Exp $	*/
+/*	$NetBSD: npf_conn.c,v 1.2 2014/07/19 20:59:01 rmind Exp $	*/
 
 /*-
  * Copyright (c) 2014 Mindaugas Rasiukevicius <rmind at netbsd org>
@@ -100,7 +100,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_conn.c,v 1.1 2014/07/19 18:24:16 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_conn.c,v 1.2 2014/07/19 20:59:01 rmind Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -328,6 +328,7 @@ npf_conn_conkey(const npf_cache_t *npc, 
 		memcpy(&key->ck_key[2 + nwords], npc->npc_ips[idst], alen);
 		keylen = (2 + (nwords * 2)) * sizeof(uint32_t);
 	}
+	(void)keylen;
 	return true;
 }
 
@@ -566,7 +567,7 @@ npf_conn_setnat(const npf_cache_t *npc, 
 		[NPF_NATIN] = NPF_SRC,
 	};
 	npf_connkey_t key, *bk;
-	npf_conn_t *ret;
+	npf_conn_t *ret __diagused;
 	npf_addr_t *taddr;
 	in_port_t tport;
 	u_int tidx;