remove unnecessary declarations and fix KNF

Thanks to riastradh@
This commit is contained in:
knakahara 2016-02-29 01:29:15 +00:00
parent e7df8a2227
commit 9b7918b3ee
2 changed files with 4 additions and 7 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: ip_encap.h,v 1.18 2016/02/26 07:35:17 knakahara Exp $ */ /* $NetBSD: ip_encap.h,v 1.19 2016/02/29 01:29:15 knakahara Exp $ */
/* $KAME: ip_encap.h,v 1.7 2000/03/25 07:23:37 sumikawa Exp $ */ /* $KAME: ip_encap.h,v 1.7 2000/03/25 07:23:37 sumikawa Exp $ */
/* /*
@ -106,9 +106,6 @@ void *encap6_ctlinput(int, const struct sockaddr *, void *);
int encap_detach(const struct encaptab *); int encap_detach(const struct encaptab *);
void *encap_getarg(struct mbuf *); void *encap_getarg(struct mbuf *);
void encap_lock_enter(void);
void encap_lock_exit(void);
#define ENCAP_PR_WRAP_CTLINPUT(name) \ #define ENCAP_PR_WRAP_CTLINPUT(name) \
static void * \ static void * \
name##_wrapper(int a, const struct sockaddr *b, void *c, void *d) \ name##_wrapper(int a, const struct sockaddr *b, void *c, void *d) \

View File

@ -1,4 +1,4 @@
/* $NetBSD: in6_gif.c,v 1.72 2016/02/26 07:35:17 knakahara Exp $ */ /* $NetBSD: in6_gif.c,v 1.73 2016/02/29 01:29:15 knakahara Exp $ */
/* $KAME: in6_gif.c,v 1.62 2001/07/29 04:27:25 itojun Exp $ */ /* $KAME: in6_gif.c,v 1.62 2001/07/29 04:27:25 itojun Exp $ */
/* /*
@ -31,7 +31,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.72 2016/02/26 07:35:17 knakahara Exp $"); __KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.73 2016/02/29 01:29:15 knakahara Exp $");
#ifdef _KERNEL_OPT #ifdef _KERNEL_OPT
#include "opt_inet.h" #include "opt_inet.h"
@ -398,7 +398,7 @@ in6_gif_detach(struct gif_softc *sc)
void * void *
in6_gif_ctlinput(int cmd, const struct sockaddr *sa, void *d, void *eparg) in6_gif_ctlinput(int cmd, const struct sockaddr *sa, void *d, void *eparg)
{ {
struct gif_softc *sc = (struct gif_softc *)eparg; struct gif_softc *sc = eparg;
struct ip6ctlparam *ip6cp = NULL; struct ip6ctlparam *ip6cp = NULL;
struct ip6_hdr *ip6; struct ip6_hdr *ip6;
const struct sockaddr_in6 *dst6; const struct sockaddr_in6 *dst6;