Second batch of cleanup changes.

This time mostly making a lot of things static and some unused
variables here and there.

5 files changed, 7 insertions, 16 deletions

diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index d129182..f2ee490 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.c	8.4 (Berkeley) 1/9/95
- *	$Id: in.c,v 1.15 1995/07/17 15:15:15 wollman Exp $
+ *	$Id: in.c,v 1.16 1995/09/21 17:50:43 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -691,7 +691,6 @@ void
 in_delmulti(inm)
 	register struct in_multi *inm;
 {
-	register struct in_multi **p;
 	struct ifreq ifr;
 	int s = splnet();
 
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 834f13a..6162d84 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in_pcb.c	8.4 (Berkeley) 5/24/95
- *	$Id: in_pcb.c,v 1.12 1995/05/30 08:09:28 rgrimes Exp $
+ *	$Id: in_pcb.c,v 1.13 1995/09/21 17:55:49 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -178,7 +178,6 @@ in_pcbladdr(inp, nam, plocal_sin)
 	struct sockaddr_in **plocal_sin;
 {
 	struct in_ifaddr *ia;
-	struct sockaddr_in *ifaddr = 0;
 	register struct sockaddr_in *sin = mtod(nam, struct sockaddr_in *);
 
 	if (nam->m_len != sizeof (*sin))
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index 42cf46d..fe9216d 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: in_rmx.c,v 1.15 1995/07/10 15:39:10 wollman Exp $
+ * $Id: in_rmx.c,v 1.16 1995/09/18 15:51:32 wollman Exp $
  */
 
 /*
@@ -204,7 +204,6 @@ static int
 in_rtqkill(struct radix_node *rn, void *rock)
 {
 	struct rtqk_arg *ap = rock;
-	struct radix_node_head *rnh = ap->rnh;
 	struct rtentry *rt = (struct rtentry *)rn;
 	int err;
 
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index aa6fc22..d6cfa42 100644
--- a/sys/netinet/ip_fw.c
+++ b/sys/netinet/ip_fw.c
@@ -11,7 +11,7 @@
  *
  * This software is provided ``AS IS'' without any warranties of any kind.
  *
- *	$Id: ip_fw.c,v 1.22 1995/07/31 13:58:35 gpalmer Exp $
+ *	$Id: ip_fw.c,v 1.24 1995/10/23 03:58:06 ugen Exp $
  */
 
 /*
@@ -851,7 +851,7 @@ clr_entry(chainptr, frwl)
 	struct ip_fw **chainptr;
 	struct ip_fw *frwl;
 {
-	struct ip_fw *ftmp, *ltmp;
+	struct ip_fw *ftmp;
 	u_short tport1, tport2, tmpnum;
 	char matches, was_found;
 
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 52a77c1..0d74d83 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -9,7 +9,7 @@
  * Modified by Bill Fenner, PARC, April 1995
  *
  * MROUTING Revision: 3.5
- * $Id: ip_mroute.c,v 1.22 1995/08/23 18:20:15 wollman Exp $
+ * $Id: ip_mroute.c,v 1.23 1995/10/06 19:30:43 wollman Exp $
  */
 
 
@@ -496,7 +496,6 @@ ip_mrouter_init(so, m)
 	struct mbuf *m;
 {
     int *v;
-    int i;
 
     if (mrtdebug)
 	log(LOG_DEBUG,"ip_mrouter_init: so_type = %d, pr_protocol = %d\n",
@@ -540,7 +539,6 @@ X_ip_mrouter_done()
     struct ifnet *ifp;
     struct ifreq ifr;
     struct mbuf *mb_rt;
-    struct mfc *rt;
     struct mbuf *m;
     struct rtdetq *rte;
     int s;
@@ -1008,7 +1006,7 @@ del_mfc(mfccp)
     struct mbuf 	*mb_rt;
     struct mbuf 	**nptr;
     u_long 		hash;
-    int s, i;
+    int s;
 
     origin = mfccp->mfcc_origin;
     mcastgrp = mfccp->mfcc_mcastgrp;
@@ -1086,7 +1084,6 @@ X_ip_mforward(ip, ifp, m, imo)
 {
     register struct mfc *rt = 0; /* XXX uninit warning */
     register u_char *ipoptions;
-    static struct sockproto	k_igmpproto 	= { AF_INET, IPPROTO_IGMP };
     static struct sockaddr_in 	k_igmpsrc	= { sizeof k_igmpsrc, AF_INET };
     static int srctun = 0;
     register struct mbuf *mm;
@@ -1376,7 +1373,6 @@ ip_mdq(m, ifp, rt, xmt_vif)
     register struct ip  *ip = mtod(m, struct ip *);
     register vifi_t vifi;
     register struct vif *vifp;
-    register struct mbuf *tmp;
     register int plen = ntohs(ip->ip_len);
 
 /*
@@ -1551,7 +1547,6 @@ encap_send(ip, vifp, m)
 {
     register struct mbuf *mb_copy;
     register struct ip *ip_copy;
-    int hlen = ip->ip_hl << 2;
     register int i, len = ip->ip_len;
 
     /*
@@ -1851,7 +1846,6 @@ tbf_dq_sel(vifp, ip)
     register struct vif *vifp;
     register struct ip *ip;
 {
-    register int i;
     register int s = splnet();
     register u_int p;
     register struct mbuf *m, *last;