Back out some style changes. They are not urgent,

I will put them back in after 5.0 is out.

Requested by: sam
Approved by: re

1 files changed, 29 insertions, 23 deletions

diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index a109d4e..929d456 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -76,7 +76,8 @@
 
 static MALLOC_DEFINE(M_IGMP, "igmp", "igmp state");
 
-static struct router_info *find_rti(struct ifnet *ifp);
+static struct router_info *
+		find_rti(struct ifnet *ifp);
 
 static struct igmpstat igmpstat;
 
@@ -92,7 +93,7 @@ static struct router_info *Head;
 static void igmp_sendpkt(struct in_multi *, int, unsigned long);
 
 void
-igmp_init(void)
+igmp_init()
 {
 	struct ipoption *ra;
 
@@ -120,9 +121,10 @@ igmp_init(void)
 }
 
 static struct router_info *
-find_rti(struct ifnet *ifp)
+find_rti(ifp)
+	struct ifnet *ifp;
 {
-        struct router_info *rti = Head;
+        register struct router_info *rti = Head;
 
 #ifdef IGMP_DEBUG
 	printf("[igmp.c, _find_rti] --> entering \n");
@@ -149,16 +151,18 @@ find_rti(struct ifnet *ifp)
 }
 
 void
-igmp_input(struct mbuf *m, int off)
+igmp_input(m, off)
+	register struct mbuf *m;
+	int off;
 {
-	int iphlen = off;
-	struct igmp *igmp;
-	struct ip *ip;
-	int igmplen;
-	struct ifnet *ifp = m->m_pkthdr.rcvif;
-	int minlen;
-	struct in_multi *inm;
-	struct in_ifaddr *ia;
+	register int iphlen = off;
+	register struct igmp *igmp;
+	register struct ip *ip;
+	register int igmplen;
+	register struct ifnet *ifp = m->m_pkthdr.rcvif;
+	register int minlen;
+	register struct in_multi *inm;
+	register struct in_ifaddr *ia;
 	struct in_multistep step;
 	struct router_info *rti;
 	
@@ -341,7 +345,8 @@ igmp_input(struct mbuf *m, int off)
 }
 
 void
-igmp_joingroup(struct in_multi *inm)
+igmp_joingroup(inm)
+	struct in_multi *inm;
 {
 	int s = splnet();
 
@@ -361,7 +366,8 @@ igmp_joingroup(struct in_multi *inm)
 }
 
 void
-igmp_leavegroup(struct in_multi *inm)
+igmp_leavegroup(inm)
+	struct in_multi *inm;
 {
 	if (inm->inm_state == IGMP_IREPORTEDLAST &&
 	    inm->inm_addr.s_addr != igmp_all_hosts_group &&
@@ -371,9 +377,9 @@ igmp_leavegroup(struct in_multi *inm)
 }
 
 void
-igmp_fasttimo(void)
+igmp_fasttimo()
 {
-	struct in_multi *inm;
+	register struct in_multi *inm;
 	struct in_multistep step;
 	int s;
 
@@ -403,10 +409,10 @@ igmp_fasttimo(void)
 }
 
 void
-igmp_slowtimo(void)
+igmp_slowtimo()
 {
 	int s = splnet();
-	struct router_info *rti =  Head;
+	register struct router_info *rti =  Head;
 
 #ifdef IGMP_DEBUG
 	printf("[igmp.c,_slowtimo] -- > entering \n");
@@ -426,13 +432,13 @@ igmp_slowtimo(void)
 	splx(s);
 }
 
-/*
- * XXX fix this static var when we remove the network code from Giant.
- */
 static struct route igmprt;
 
 static void
-igmp_sendpkt(struct in_multi *inm, int type, unsigned long addr)
+igmp_sendpkt(inm, type, addr)
+	struct in_multi *inm;
+	int type;
+	unsigned long addr;
 {
         struct mbuf *m;
         struct igmp *igmp;