Destatic.

ok kettenis@ claudio@ naddy@

1 files changed, 37 insertions, 37 deletions

diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index e88e7d12ef9..a65df1f2b51 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icmp6.c,v 1.109 2010/01/05 22:28:09 jasper Exp $	*/
+/*	$OpenBSD: icmp6.c,v 1.110 2010/01/14 04:27:32 jsing Exp $	*/
 /*	$KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $	*/
 
 /*
@@ -168,32 +168,32 @@ static struct rttimer_queue *icmp6_redirect_timeout_q = NULL;
 /* XXX experimental, turned off */
 static int icmp6_redirect_lowat = -1;
 
-static void icmp6_errcount(struct icmp6errstat *, int, int);
-static int icmp6_rip6_input(struct mbuf **, int);
-static int icmp6_ratelimit(const struct in6_addr *, const int, const int);
-static const char *icmp6_redirect_diag(struct in6_addr *,
-	struct in6_addr *, struct in6_addr *);
-static struct mbuf *ni6_input(struct mbuf *, int);
-static struct mbuf *ni6_nametodns(const char *, int, int);
-static int ni6_dnsmatch(const char *, int, const char *, int);
-static int ni6_addrs(struct icmp6_nodeinfo *, struct mbuf *,
-			  struct ifnet **, char *);
-static int ni6_store_addrs(struct icmp6_nodeinfo *, struct icmp6_nodeinfo *,
-				struct ifnet *, int);
-static int icmp6_notify_error(struct mbuf *, int, int, int);
-static struct rtentry *icmp6_mtudisc_clone(struct sockaddr *);
-static void icmp6_mtudisc_timeout(struct rtentry *, struct rttimer *);
-static void icmp6_redirect_timeout(struct rtentry *, struct rttimer *);
+void	icmp6_errcount(struct icmp6errstat *, int, int);
+int	icmp6_rip6_input(struct mbuf **, int);
+int	icmp6_ratelimit(const struct in6_addr *, const int, const int);
+const char *icmp6_redirect_diag(struct in6_addr *, struct in6_addr *,
+	    struct in6_addr *);
+struct mbuf *ni6_input(struct mbuf *, int);
+struct mbuf *ni6_nametodns(const char *, int, int);
+int	ni6_dnsmatch(const char *, int, const char *, int);
+int	ni6_addrs(struct icmp6_nodeinfo *, struct mbuf *, struct ifnet **,
+	    char *);
+int	ni6_store_addrs(struct icmp6_nodeinfo *, struct icmp6_nodeinfo *,
+	    struct ifnet *, int);
+int	icmp6_notify_error(struct mbuf *, int, int, int);
+struct rtentry *icmp6_mtudisc_clone(struct sockaddr *);
+void	icmp6_mtudisc_timeout(struct rtentry *, struct rttimer *);
+void	icmp6_redirect_timeout(struct rtentry *, struct rttimer *);
 
 void
-icmp6_init()
+icmp6_init(void)
 {
 	mld6_init();
 	icmp6_mtudisc_timeout_q = rt_timer_queue_create(pmtu_expire);
 	icmp6_redirect_timeout_q = rt_timer_queue_create(icmp6_redirtimeout);
 }
 
-static void
+void
 icmp6_errcount(struct icmp6errstat *stat, int type, int code)
 {
 	switch (type) {
@@ -893,7 +893,7 @@ badlen:
 	return IPPROTO_DONE;
 }
 
-static int
+int
 icmp6_notify_error(struct mbuf *m, int off, int icmp6len, int code)
 {
 	struct icmp6_hdr *icmp6;
@@ -1184,7 +1184,7 @@ icmp6_mtudisc_update(struct ip6ctlparam *ip6cp, int validated)
 #ifndef offsetof		/* XXX */
 #define	offsetof(type, member)	((size_t)(&((type *)0)->member))
 #endif
-static struct mbuf *
+struct mbuf *
 ni6_input(struct mbuf *m, int off)
 {
 	struct icmp6_nodeinfo *ni6, *nni6;
@@ -1487,7 +1487,7 @@ ni6_input(struct mbuf *m, int off)
  *
  * old - return pascal string if non-zero
  */
-static struct mbuf *
+struct mbuf *
 ni6_nametodns(const char *name, int namelen, int old)
 {
 	struct mbuf *m;
@@ -1594,7 +1594,7 @@ ni6_nametodns(const char *name, int namelen, int old)
  * form (with \0\0 at the end).  no compression support.
  * XXX upper/lowercase match (see RFC2065)
  */
-static int
+int
 ni6_dnsmatch(const char *a, int alen, const char *b, int blen)
 {
 	const char *a0, *b0;
@@ -1654,9 +1654,9 @@ ni6_dnsmatch(const char *a, int alen, const char *b, int blen)
 /*
  * calculate the number of addresses to be returned in the node info reply.
  */
-static int
+int
 ni6_addrs(struct icmp6_nodeinfo *ni6, struct mbuf *m, struct ifnet **ifpp, 
-	char *subj)
+    char *subj)
 {
 	struct ifnet *ifp;
 	struct in6_ifaddr *ifa6;
@@ -1742,9 +1742,9 @@ ni6_addrs(struct icmp6_nodeinfo *ni6, struct mbuf *m, struct ifnet **ifpp,
 	return (addrs);
 }
 
-static int
+int
 ni6_store_addrs(struct icmp6_nodeinfo *ni6, struct icmp6_nodeinfo *nni6, 
-	struct ifnet *ifp0, int resid)
+    struct ifnet *ifp0, int resid)
 {
 	struct ifnet *ifp = ifp0 ? ifp0 : TAILQ_FIRST(&ifnet);
 	struct in6_ifaddr *ifa6;
@@ -1880,7 +1880,7 @@ ni6_store_addrs(struct icmp6_nodeinfo *ni6, struct icmp6_nodeinfo *nni6,
 /*
  * XXX almost dup'ed code with rip6_input.
  */
-static int
+int
 icmp6_rip6_input(struct mbuf **mp, int off)
 {
 	struct mbuf *m = *mp;
@@ -2145,15 +2145,15 @@ icmp6_reflect(struct mbuf *m, size_t off)
 }
 
 void
-icmp6_fasttimo()
+icmp6_fasttimo(void)
 {
 
 	mld6_fasttimeo();
 }
 
-static const char *
+const char *
 icmp6_redirect_diag(struct in6_addr *src6, struct in6_addr *dst6, 
-	struct in6_addr *tgt6)
+    struct in6_addr *tgt6)
 {
 	static char buf[1024];
 	snprintf(buf, sizeof(buf), "(src=%s dst=%s tgt=%s)",
@@ -2644,7 +2644,7 @@ fail:
  */
 int
 icmp6_ctloutput(int op, struct socket *so, int level, int optname, 
-	struct mbuf **mp)
+    struct mbuf **mp)
 {
 	int error = 0;
 	struct in6pcb *in6p = sotoin6pcb(so);
@@ -2732,7 +2732,7 @@ icmp6_ctloutput(int op, struct socket *so, int level, int optname,
  * type - not used at this moment
  * code - not used at this moment
  */
-static int
+int
 icmp6_ratelimit(const struct in6_addr *dst, const int type, const int code)
 {
 	int ret;
@@ -2749,7 +2749,7 @@ icmp6_ratelimit(const struct in6_addr *dst, const int type, const int code)
 	return ret;
 }
 
-static struct rtentry *
+struct rtentry *
 icmp6_mtudisc_clone(struct sockaddr *dst)
 {
 	struct rtentry *rt;
@@ -2787,7 +2787,7 @@ icmp6_mtudisc_clone(struct sockaddr *dst)
 	return rt;	/* caller need to call rtfree() */
 }
 
-static void
+void
 icmp6_mtudisc_timeout(struct rtentry *rt, struct rttimer *r)
 {
 	if (rt == NULL)
@@ -2808,7 +2808,7 @@ icmp6_mtudisc_timeout(struct rtentry *rt, struct rttimer *r)
 	}
 }
 
-static void
+void
 icmp6_redirect_timeout(struct rtentry *rt, struct rttimer *r)
 {
 	if (rt == NULL)
@@ -2833,7 +2833,7 @@ int *icmpv6ctl_vars[ICMPV6CTL_MAXID] = ICMPV6CTL_VARS;
 
 int
 icmp6_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, 
-	void *newp, size_t newlen)
+    void *newp, size_t newlen)
 {
 	/* All sysctl names at this level are terminal. */
 	if (namelen != 1)