The "easy" fixes for compiling the kernel -Wunused: remove unreferenced static

and local variables, goto labels, and functions declared but not defined.

10 files changed, 17 insertions, 38 deletions

diff --git a/sys/miscfs/devfs/devfs_vfsops.c b/sys/miscfs/devfs/devfs_vfsops.c
index 0229dd0..95ae957 100644
--- a/sys/miscfs/devfs/devfs_vfsops.c
+++ b/sys/miscfs/devfs/devfs_vfsops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- *	$Id: devfs_vfsops.c,v 1.33 1998/09/08 16:59:37 bde Exp $
+ *	$Id: devfs_vfsops.c,v 1.34 1998/10/31 15:31:23 peter Exp $
  *
  */
 
@@ -258,7 +258,6 @@ static int
 devfs_sync(struct mount *mp, int waitfor,struct ucred *cred,struct proc *p)
 {
 	register struct vnode *vp, *nvp;
-	struct timeval tv;
 	int error, allerror = 0;
 
 DBPRINT(("sync "));
@@ -294,6 +293,8 @@ loop:
 		}
 #ifdef NOTYET
 		else {
+			struct timeval tv;
+
 			tv = time;
 			/* VOP_UPDATE(vp, &tv, &tv, waitfor == MNT_WAIT); */
 			VOP_UPDATE(vp, &tv, &tv, 0);
diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c
index e694a09..de52842 100644
--- a/sys/miscfs/devfs/devfs_vnops.c
+++ b/sys/miscfs/devfs/devfs_vnops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- *	$Id: devfs_vnops.c,v 1.61 1998/09/30 20:33:46 sos Exp $
+ *	$Id: devfs_vnops.c,v 1.62 1998/10/31 15:31:23 peter Exp $
  */
 
 
@@ -639,9 +639,6 @@ devfs_xwrite(struct vop_write_args *ap)
                 struct ucred *a_cred;
         } */
 {
-	dn_p	file_node;
-	int	error;
-
 	switch (ap->a_vp->v_type) {
 	case VREG:
 		return(EINVAL);
@@ -1337,8 +1334,7 @@ static int
 devfs_open( struct vop_open_args *ap)
 {
 	struct proc *p = ap->a_p;
-	struct vnode *bvp, *vp = ap->a_vp;
-	dev_t bdev, dev = (dev_t)vp->v_rdev;
+	struct vnode *vp = ap->a_vp;
 	int error;
 	dn_p	dnp;
 
@@ -1387,7 +1383,7 @@ devfs_read( struct vop_read_args *ap)
 	daddr_t bn, nextbn;
 	long bsize, bscale;
 	struct partinfo dpart;
-	int n, on, majordev;
+	int n, on;
 	d_ioctl_t *ioctl;
 	int error = 0;
 	dev_t dev;
@@ -1777,11 +1773,8 @@ static int
 devfs_close(struct vop_close_args *ap)
 {
 	register struct vnode *vp = ap->a_vp;
-	struct proc *p = ap->a_p;
-	dev_t dev = vp->v_rdev;
-	d_close_t *devclose;
-	int mode, error;
-	dn_p	dnp;
+	int error;
+	dn_p dnp;
 
 	if (error = devfs_vntodn(vp,&dnp))
 		return error;
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index a8ec176..ff7fbee 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vnops.c,v 1.37 1998/06/10 21:21:28 dfr Exp $
+ * $Id: fdesc_vnops.c,v 1.38 1998/06/14 08:46:41 bde Exp $
  */
 
 /*
@@ -84,8 +84,6 @@ static int	fdesc_attr __P((int fd, struct vattr *vap, struct ucred *cred,
 				struct proc *p));
 static int	fdesc_badop __P((void));
 static int	fdesc_getattr __P((struct vop_getattr_args *ap));
-static struct fdcache *
-		fdesc_hash __P((int ix));
 static int	fdesc_inactive __P((struct vop_inactive_args *ap));
 static int	fdesc_ioctl __P((struct vop_ioctl_args *ap));
 static int	fdesc_lookup __P((struct vop_lookup_args *ap));
diff --git a/sys/miscfs/kernfs/kernfs_vfsops.c b/sys/miscfs/kernfs/kernfs_vfsops.c
index c30ed01..49f7288 100644
--- a/sys/miscfs/kernfs/kernfs_vfsops.c
+++ b/sys/miscfs/kernfs/kernfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs_vfsops.c	8.10 (Berkeley) 5/14/95
- * $Id: kernfs_vfsops.c,v 1.22 1998/05/06 05:29:33 msmith Exp $
+ * $Id: kernfs_vfsops.c,v 1.23 1998/09/07 13:17:01 bde Exp $
  */
 
 /*
@@ -56,7 +56,6 @@ static MALLOC_DEFINE(M_KERNFSMNT, "KERNFS mount", "KERNFS mount structure");
 
 dev_t rrootdev = NODEV;
 
-static int	cdevvp __P((dev_t dev, struct vnode **vpp));
 static void	kernfs_get_rrootdev __P((void));
 static int	kernfs_init __P((struct vfsconf *vfsp));
 static int	kernfs_mount __P((struct mount *mp, char *path, caddr_t data,
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index c08bdd3..81261a9 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs_vnops.c	8.15 (Berkeley) 5/21/95
- * $Id: kernfs_vnops.c,v 1.35 1998/07/30 17:40:45 bde Exp $
+ * $Id: kernfs_vnops.c,v 1.36 1998/12/04 22:54:51 archie Exp $
  */
 
 /*
@@ -106,11 +106,9 @@ static int nkern_targets = sizeof(kern_targets) / sizeof(kern_targets[0]);
 
 static int	kernfs_access __P((struct vop_access_args *ap));
 static int	kernfs_badop __P((void));
-static int	kernfs_enotsupp __P((void));
 static int	kernfs_getattr __P((struct vop_getattr_args *ap));
 static int	kernfs_inactive __P((struct vop_inactive_args *ap));
 static int	kernfs_lookup __P((struct vop_lookup_args *ap));
-static int	kernfs_pathconf __P((struct vop_pathconf_args *ap));
 static int	kernfs_print __P((struct vop_print_args *ap));
 static int	kernfs_read __P((struct vop_read_args *ap));
 static int	kernfs_readdir __P((struct vop_readdir_args *ap));
@@ -235,7 +233,6 @@ kernfs_lookup(ap)
 	struct proc *p = cnp->cn_proc;
 	struct kern_target *kt;
 	struct vnode *fvp;
-	int nameiop = cnp->cn_nameiop;
 	int error, i;
 
 #ifdef KERNFS_DIAGNOSTIC
@@ -374,7 +371,6 @@ kernfs_getattr(ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct vattr *vap = ap->a_vap;
-	struct timeval tv;
 	int error = 0;
 	char strbuf[KSTRING];
 
@@ -459,7 +455,6 @@ kernfs_read(ap)
 	char strbuf[KSTRING];
 	int off = uio->uio_offset;
 	int error, len;
-	char *cp;
 
 	if (vp->v_type == VDIR)
 		return (EOPNOTSUPP);
diff --git a/sys/miscfs/nullfs/null_vnops.c b/sys/miscfs/nullfs/null_vnops.c
index 1398e34..b2e1b63 100644
--- a/sys/miscfs/nullfs/null_vnops.c
+++ b/sys/miscfs/nullfs/null_vnops.c
@@ -37,11 +37,11 @@
  *
  * Ancestors:
  *	@(#)lofs_vnops.c	1.2 (Berkeley) 6/18/92
- *	$Id: null_vnops.c,v 1.28 1998/06/10 06:34:56 peter Exp $
+ *	$Id: null_vnops.c,v 1.29 1998/07/04 20:45:33 julian Exp $
  *	...and...
  *	@(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
  *
- * $Id: null_vnops.c,v 1.28 1998/06/10 06:34:56 peter Exp $
+ * $Id: null_vnops.c,v 1.29 1998/07/04 20:45:33 julian Exp $
  */
 
 /*
@@ -523,8 +523,6 @@ null_unlock(ap)
 		struct proc *a_p;
 	} */ *ap;
 {
-	struct vnode *vp = ap->a_vp;
-
 	vop_nounlock(ap);
 	ap->a_flags &= ~LK_INTERLOCK;
 	return (null_bypass((struct vop_generic_args *)ap));
diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c
index 11a1e84..6ed96c5 100644
--- a/sys/miscfs/portal/portal_vnops.c
+++ b/sys/miscfs/portal/portal_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vnops.c	8.14 (Berkeley) 5/21/95
  *
- * $Id: portal_vnops.c,v 1.32 1998/06/10 06:34:57 peter Exp $
+ * $Id: portal_vnops.c,v 1.33 1998/06/10 21:21:31 dfr Exp $
  */
 
 /*
@@ -445,7 +445,6 @@ portal_getattr(ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct vattr *vap = ap->a_vap;
-	struct timeval tv;
 
 	bzero(vap, sizeof(*vap));
 	vattr_null(vap);
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 83f77e8..f0914c3 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.75 1998/10/26 08:53:13 bde Exp $
+ * $Id: spec_vnops.c,v 1.76 1998/10/31 15:31:24 peter Exp $
  */
 
 #include <sys/param.h>
@@ -605,7 +605,6 @@ spec_close(ap)
 	} */ *ap;
 {
 	register struct vnode *vp = ap->a_vp;
-	struct proc *p = ap->a_p;
 	dev_t dev = vp->v_rdev;
 	d_close_t *devclose;
 	int mode, error;
diff --git a/sys/miscfs/umapfs/umap_vnops.c b/sys/miscfs/umapfs/umap_vnops.c
index a41a575..893e1e5 100644
--- a/sys/miscfs/umapfs/umap_vnops.c
+++ b/sys/miscfs/umapfs/umap_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)umap_vnops.c	8.6 (Berkeley) 5/22/95
- * $Id: umap_vnops.c,v 1.24 1998/07/04 20:45:34 julian Exp $
+ * $Id: umap_vnops.c,v 1.25 1998/07/30 17:40:45 bde Exp $
  */
 
 /*
@@ -386,8 +386,6 @@ umap_unlock(ap)
 		struct proc *a_p;
 	} */ *ap;
 {
-	struct vnode *vp = ap->a_vp;
-
 	vop_nounlock(ap);
 	ap->a_flags &= ~LK_INTERLOCK;
 	return (null_bypass((struct vop_generic_args *)ap));
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index 4e7089e..f1db32e 100644
--- a/sys/miscfs/union/union_subr.c
+++ b/sys/miscfs/union/union_subr.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_subr.c	8.20 (Berkeley) 5/20/95
- * $Id: union_subr.c,v 1.33 1998/11/15 15:33:51 bde Exp $
+ * $Id: union_subr.c,v 1.34 1998/12/07 02:47:46 eivind Exp $
  */
 
 #include <sys/param.h>
@@ -310,7 +310,6 @@ union_allocvp(vpp, mp, undvp, dvp, cnp, uppervp, lowervp, docache)
 	int hash;
 	int vflag;
 	int try;
-	int	klocked;
 
 	if (uppervp == NULLVP && lowervp == NULLVP)
 		panic("union: unidentifiable allocation");