Second batch of cleanup changes.

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

11 files changed, 15 insertions, 33 deletions

diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index c6c2b42..f7b6042 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_acct.c	8.1 (Berkeley) 6/14/93
- *	$Id: kern_acct.c,v 1.6 1994/10/02 17:35:09 phk Exp $
+ *	$Id: kern_acct.c,v 1.7 1995/07/23 23:02:20 mpp Exp $
  */
 
 #include <sys/param.h>
@@ -161,7 +161,7 @@ acct_process(p)
 	struct acct acct;
 	struct rusage *r;
 	struct timeval ut, st, tmp;
-	int s, t;
+	int t;
 	struct vnode *vp;
 
 	/* If accounting isn't enabled, don't bother */
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index 0e4145a..a2e2d47 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)subr_log.c	8.1 (Berkeley) 6/10/93
- * $Id: subr_log.c,v 1.8 1995/05/30 08:05:52 rgrimes Exp $
+ * $Id: subr_log.c,v 1.9 1995/08/07 07:58:17 davidg Exp $
  */
 
 /*
@@ -67,8 +67,6 @@ logopen(dev, flags, mode, p)
 	int flags, mode;
 	struct proc *p;
 {
-	register struct msgbuf *mbp = msgbufp;
-
 	if (log_open)
 		return (EBUSY);
 	log_open = 1;
diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c
index abfc765..77c1596 100644
--- a/sys/kern/tty_snoop.c
+++ b/sys/kern/tty_snoop.c
@@ -182,7 +182,6 @@ snpin(snp, buf, n)
 	int             s, len, nblen;
 	caddr_t         from, to;
 	char           *nbuf;
-	struct tty     *tp;
 
 
 	if (n == 0)
@@ -471,7 +470,7 @@ snpselect(dev, rw, p)
 	int             rw;
 	struct proc    *p;
 {
-	int             unit = minor(dev), s;
+	int             unit = minor(dev);
 	struct snoop   *snp = &snoopsw[unit];
 
 	if (rw != FREAD)
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index a0ed0ed..d180cac 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_mbuf.c	8.2 (Berkeley) 1/4/94
- * $Id: uipc_mbuf.c,v 1.11 1995/08/28 09:18:52 julian Exp $
+ * $Id: uipc_mbuf.c,v 1.12 1995/09/09 18:10:12 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -97,7 +97,6 @@ m_clalloc(ncl, nowait)
 	register int ncl;
 	int nowait;
 {
-	static int logged;
 	register caddr_t p;
 	register int i;
 	int npg;
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index d9c644c..1e45a1e 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -18,7 +18,7 @@
  * 5. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: vfs_bio.c,v 1.66 1995/10/08 00:06:08 swallace Exp $
+ * $Id: vfs_bio.c,v 1.67 1995/10/19 23:48:25 dyson Exp $
  */
 
 /*
@@ -640,7 +640,6 @@ getnewbuf(int slpflag, int slptimeo, int doingvmio)
 {
 	struct buf *bp;
 	int s;
-	int firstbp = 1;
 
 	s = splbio();
 start:
@@ -789,7 +788,6 @@ inmem(struct vnode * vp, daddr_t blkno)
 	off = blkno * vp->v_mount->mnt_stat.f_iosize;
 
 	for (toff = 0; toff < vp->v_mount->mnt_stat.f_iosize; toff += tinc) {
-		int mask;
 
 		m = vm_page_lookup(obj, trunc_page(toff + off));
 		if (!m)
@@ -869,8 +867,6 @@ getblk(struct vnode * vp, daddr_t blkno, int size, int slpflag, int slptimeo)
 	struct buf *bp;
 	int s;
 	struct bufhashhdr *bh;
-	vm_offset_t off;
-	int nleft;
 
 	s = splbio();
 loop:
@@ -1092,13 +1088,11 @@ allocbuf(struct buf * bp, int size)
 				curbpnpages = bp->b_npages;
 				bp->b_flags |= B_CACHE;
 				for (toff = 0; toff < newbsize; toff += tinc) {
-					int mask;
 					int bytesinpage;
 
 					pageindex = toff / PAGE_SIZE;
 					objoff = trunc_page(toff + off);
 					if (pageindex < curbpnpages) {
-						int pb;
 
 						m = bp->b_pages[pageindex];
 						if (m->offset != objoff)
@@ -1145,7 +1139,6 @@ allocbuf(struct buf * bp, int size)
 
 						goto doretry;
 					} else {
-						int pb;
 						if ((curproc != pageproc) &&
 							(m->flags & PG_CACHE) &&
 						    (cnt.v_free_count + cnt.v_cache_count) < cnt.v_free_min) {
@@ -1229,7 +1222,6 @@ biodone(register struct buf * bp)
 	bp->b_flags |= B_DONE;
 
 	if ((bp->b_flags & B_READ) == 0) {
-		struct vnode *vp = bp->b_vp;
 		vwakeup(bp);
 	}
 #ifdef BOUNCE_BUFFERS
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 7b0fc56..7813a9a 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cache.c	8.3 (Berkeley) 8/22/94
- * $Id: vfs_cache.c,v 1.15 1995/05/30 08:06:28 rgrimes Exp $
+ * $Id: vfs_cache.c,v 1.16 1995/07/29 11:40:19 bde Exp $
  */
 
 #include <sys/param.h>
@@ -296,7 +296,7 @@ cache_purgevfs(mp)
 	struct mount *mp;
 {
 	struct nchashhead *ncpp;
-	struct namecache *ncp, *nxtcp;
+	struct namecache *ncp;
 
 	/* Scan hash tables for applicable entries */
 	for (ncpp = &nchashtbl[nchash - 1]; ncpp >= nchashtbl; ncpp--) {
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c
index bfc1671..8644b7f 100644
--- a/sys/kern/vfs_cluster.c
+++ b/sys/kern/vfs_cluster.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_cluster.c	8.7 (Berkeley) 2/13/94
- * $Id: vfs_cluster.c,v 1.21 1995/09/23 21:12:45 dyson Exp $
+ * $Id: vfs_cluster.c,v 1.22 1995/10/09 03:19:49 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -122,7 +122,6 @@ cluster_read(vp, filesize, lblkno, size, cred, bpp)
 {
 	struct buf *bp, *rbp;
 	daddr_t blkno, rablkno, origlblkno;
-	long flags;
 	int error, num_ra, alreadyincore;
 	int i;
 	int seq;
@@ -192,7 +191,6 @@ cluster_read(vp, filesize, lblkno, size, cred, bpp)
 			alreadyincore = (int) incore(vp, rablkno);
 			if (!alreadyincore) {
 				if (inmem(vp, rablkno)) {
-					struct buf *bpt;
 					if (vp->v_maxra < rablkno)
 						vp->v_maxra = rablkno + 1;
 					continue;
@@ -402,7 +400,6 @@ cluster_callback(bp)
 {
 	struct cluster_save *b_save;
 	struct buf **bpp, *tbp;
-	caddr_t cp;
 	int error = 0;
 
 	/*
@@ -566,7 +563,6 @@ cluster_wbuild(vp, last_bp, size, start_lbn, len, lbn)
 {
 	struct cluster_save *b_save;
 	struct buf *bp, *tbp, *pb;
-	caddr_t cp;
 	int i, j, s;
 
 #ifdef DIAGNOSTIC
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c
index b5718f6..ba2a229 100644
--- a/sys/kern/vfs_conf.c
+++ b/sys/kern/vfs_conf.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
- * $Id: vfs_conf.c,v 1.8 1995/08/30 00:17:18 bde Exp $
+ * $Id: vfs_conf.c,v 1.9 1995/09/09 18:10:15 davidg Exp $
  */
 
 /*
@@ -104,7 +104,6 @@ vfs_mountroot(data)
 	u_int			size;
 	int			err = 0;
 	struct proc		*p = curproc;	/* XXX */
-	register struct fs	*fs;
 	struct vfsops		*mnt_op = (struct vfsops *)data;
 
 	/*
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index b5718f6..ba2a229 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_conf.c	8.8 (Berkeley) 3/31/94
- * $Id: vfs_conf.c,v 1.8 1995/08/30 00:17:18 bde Exp $
+ * $Id: vfs_conf.c,v 1.9 1995/09/09 18:10:15 davidg Exp $
  */
 
 /*
@@ -104,7 +104,6 @@ vfs_mountroot(data)
 	u_int			size;
 	int			err = 0;
 	struct proc		*p = curproc;	/* XXX */
-	register struct fs	*fs;
 	struct vfsops		*mnt_op = (struct vfsops *)data;
 
 	/*
diff --git a/sys/kern/vnode_if.pl b/sys/kern/vnode_if.pl
index b89ca15..6994f22 100644
--- a/sys/kern/vnode_if.pl
+++ b/sys/kern/vnode_if.pl
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.sh	8.1 (Berkeley) 6/10/93
-# $Id: vnode_if.sh,v 1.5 1995/09/04 00:20:18 dyson Exp $
+# $Id: vnode_if.sh,v 1.6 1995/09/11 16:05:16 bde Exp $
 #
 
 # Script to produce VFS front-end sugar.
@@ -275,7 +275,7 @@ $AWK 'function kill_surrounding_ws (s) {
 	}
 
 	function generate_operation_vp_offsets() {
-		printf ("int %s_vp_offsets[] = {\n", name);
+		printf ("static int %s_vp_offsets[] = {\n", name);
 		# as a side effect, figure out the releflags
 		releflags = "";
 		vpnum = 0;
diff --git a/sys/kern/vnode_if.sh b/sys/kern/vnode_if.sh
index b89ca15..6994f22 100644
--- a/sys/kern/vnode_if.sh
+++ b/sys/kern/vnode_if.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)vnode_if.sh	8.1 (Berkeley) 6/10/93
-# $Id: vnode_if.sh,v 1.5 1995/09/04 00:20:18 dyson Exp $
+# $Id: vnode_if.sh,v 1.6 1995/09/11 16:05:16 bde Exp $
 #
 
 # Script to produce VFS front-end sugar.
@@ -275,7 +275,7 @@ $AWK 'function kill_surrounding_ws (s) {
 	}
 
 	function generate_operation_vp_offsets() {
-		printf ("int %s_vp_offsets[] = {\n", name);
+		printf ("static int %s_vp_offsets[] = {\n", name);
 		# as a side effect, figure out the releflags
 		releflags = "";
 		vpnum = 0;