From 3cc9960fd1b52e850d61e0fdab1cf2cb1a9f3735 Mon Sep 17 00:00:00 2001 From: julian Date: Fri, 7 Sep 2001 07:19:12 +0000 Subject: 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 / Obtained from: KAME --- sys/net/if_stf.c | 13 +++---------- sys/net/if_stf.h | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'sys/net') diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c index e6947a1..c553967 100644 --- a/sys/net/if_stf.c +++ b/sys/net/if_stf.c @@ -530,14 +530,11 @@ stf_checkaddr6(sc, in6, inifp) } void -#if __STDC__ -in_stf_input(struct mbuf *m, ...) -#else -in_stf_input(m, va_alist) +in_stf_input(m, off) struct mbuf *m; -#endif + int off; { - int off, proto; + int proto; struct stf_softc *sc; struct ip *ip; struct ip6_hdr *ip6; @@ -545,12 +542,8 @@ in_stf_input(m, va_alist) int len, isr; struct ifqueue *ifq = NULL; struct ifnet *ifp; - va_list ap; - va_start(ap, m); - off = va_arg(ap, int); proto = mtod(m, struct ip *)->ip_p; - va_end(ap); if (proto != IPPROTO_IPV6) { m_freem(m); diff --git a/sys/net/if_stf.h b/sys/net/if_stf.h index 258f3a0..67bb2f1 100644 --- a/sys/net/if_stf.h +++ b/sys/net/if_stf.h @@ -33,6 +33,6 @@ #ifndef _NET_IF_STF_H_ #define _NET_IF_STF_H_ -void in_stf_input __P((struct mbuf *, ...)); +void in_stf_input __P((struct mbuf *, int)); #endif /* _NET_IF_STF_H_ */ -- cgit v1.1