Patches from KAME to remove usage of Varargs in existing

IPV4 code. For now they will still have some in the developing stuff (IPv6)

Submitted by:	Keiichi SHIMA / <keiichi@iij.ad.jp>
Obtained from:	KAME

2 files changed, 4 insertions, 13 deletions

diff --git a/sys/netinet/ip_encap.c b/sys/netinet/ip_encap.c
index 2476d71..e3844df 100644
--- a/sys/netinet/ip_encap.c
+++ b/sys/netinet/ip_encap.c
@@ -127,26 +127,17 @@ encap_init()
 
 #ifdef INET
 void
-#if __STDC__
-encap4_input(struct mbuf *m, ...)
-#else
-encap4_input(m, va_alist)
+encap4_input(m, off)
 	struct mbuf *m;
-	va_dcl
-#endif
+	int off;
 {
-	int off, proto;
 	struct ip *ip;
+	int proto;
 	struct sockaddr_in s, d;
 	const struct protosw *psw;
 	struct encaptab *ep, *match;
-	va_list ap;
 	int prio, matchprio;
 
-	va_start(ap, m);
-	off = va_arg(ap, int);
-	va_end(ap);
-
 	ip = mtod(m, struct ip *);
 	proto = ip->ip_p;
 
diff --git a/sys/netinet/ip_encap.h b/sys/netinet/ip_encap.h
index 38df6f9..94f534b 100644
--- a/sys/netinet/ip_encap.h
+++ b/sys/netinet/ip_encap.h
@@ -49,7 +49,7 @@ struct encaptab {
 };
 
 void	encap_init __P((void));
-void	encap4_input __P((struct mbuf *, ...));
+void	encap4_input __P((struct mbuf *, int));
 int	encap6_input __P((struct mbuf **, int *, int));
 const struct encaptab *encap_attach __P((int, int, const struct sockaddr *,
 	const struct sockaddr *, const struct sockaddr *,