Add and move declarations to fix all of the warnings from `gcc -Wimplicit'

(except in netccitt, netiso and netns) and most of the warnings from
`gcc -Wnested-externs'.  Fix all the bugs found.  There were no serious
ones.

15 files changed, 37 insertions, 30 deletions

diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c
index 080f342..a6292f3 100644
--- a/sys/fs/cd9660/cd9660_node.c
+++ b/sys/fs/cd9660/cd9660_node.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.c	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.c,v 1.8 1995/01/16 17:03:24 joerg Exp $
+ * $Id: cd9660_node.c,v 1.9 1995/02/21 18:41:30 bde Exp $
  */
 
 #include <sys/param.h>
@@ -80,8 +80,6 @@ union iso_dhead {
 } iso_dhead[DNOHSZ];
 #endif
 
-int prtactive;	/* 1 => print out reclaim of active vnodes */
-
 /*
  * Initialize hash links for inodes and dnodes.
  */
@@ -289,11 +287,8 @@ loop:
 	vp->v_type = IFTOVT(ip->inode.iso_mode);
 	
 	if ( vp->v_type == VFIFO ) {
-		extern int (**cd9660_fifoop_p)();
 		vp->v_op = cd9660_fifoop_p;
 	} else if ( vp->v_type == VCHR || vp->v_type == VBLK ) {
-		extern int (**cd9660_specop_p)();
-
 		/*
 		 * if device, look at device number table for translation
 		 */
diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h
index ca7627e..1e593a2 100644
--- a/sys/fs/cd9660/cd9660_node.h
+++ b/sys/fs/cd9660/cd9660_node.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_node.h	8.2 (Berkeley) 1/23/94
- * $Id: cd9660_node.h,v 1.3 1994/09/15 19:46:00 bde Exp $
+ * $Id: cd9660_node.h,v 1.4 1995/01/16 17:03:25 joerg Exp $
  */
 
 /*
@@ -111,6 +111,9 @@ struct iso_node {
 #define ISO_ILOCK(ip)	iso_ilock(ip)
 #define ISO_IUNLOCK(ip)	iso_iunlock(ip)
 
+extern int	(**cd9660_fifoop_p)();
+extern int	(**cd9660_specop_p)();
+
 /*
  * Prototypes for ISOFS vnode operations
  */
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c
index d82f14d..e44c045 100644
--- a/sys/fs/fdescfs/fdesc_vfsops.c
+++ b/sys/fs/fdescfs/fdesc_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vfsops.c	8.4 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vfsops.c,v 1.1.1.1 1994/05/24 10:04:59 rgrimes Exp $
+ * $Id: fdesc_vfsops.c,v 1.2 1994/09/21 03:46:55 wollman Exp $
  */
 
 /*
@@ -116,7 +116,6 @@ fdesc_unmount(mp, mntflags, p)
 {
 	int error;
 	int flags = 0;
-	extern int doforce;
 	struct vnode *rootvp = VFSTOFDESC(mp)->f_root;
 
 	if (mntflags & MNT_FORCE) {
diff --git a/sys/fs/fifofs/fifo.h b/sys/fs/fifofs/fifo.h
index 384b6c2..3f2d8ef 100644
--- a/sys/fs/fifofs/fifo.h
+++ b/sys/fs/fifofs/fifo.h
@@ -31,9 +31,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.2 (Berkeley) 2/2/94
- * $Id: fifo.h,v 1.3 1994/09/22 19:38:05 wollman Exp $
+ * $Id: fifo.h,v 1.4 1995/02/14 06:30:18 phk Exp $
  */
 
+extern int	(**fifo_vnodeop_p)();
+
 /*
  * Prototypes for fifo operations on vnodes.
  */
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 78f6201..bf1ec82 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.2 (Berkeley) 1/4/94
- * $Id: fifo_vnops.c,v 1.6 1994/10/02 17:48:00 phk Exp $
+ * $Id: fifo_vnops.c,v 1.7 1995/02/03 06:46:13 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -48,6 +48,7 @@
 #include <sys/file.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
+#include <sys/un.h>
 #include <miscfs/fifofs/fifo.h>
 
 /*
diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h
index a45994b..b47196a 100644
--- a/sys/fs/msdosfs/denode.h
+++ b/sys/fs/msdosfs/denode.h
@@ -1,4 +1,4 @@
-/*	$Id: denode.h,v 1.2 1994/12/12 12:35:40 bde Exp $ */
+/*	$Id: denode.h,v 1.3 1994/12/27 12:37:33 bde Exp $ */
 /*	$NetBSD: denode.h,v 1.8 1994/08/21 18:43:49 ws Exp $	*/
 
 /*-
@@ -225,6 +225,8 @@ struct defid {
 	/* u_long	defid_gen;	 generation number */
 };
 
+extern int (**msdosfs_vnodeop_p)();
+
 /*
  * Prototypes for MSDOSFS vnode operations
  */
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index 2e03af6..1d08e42 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_denode.c,v 1.7 1995/01/09 16:04:59 davidg Exp $ */
+/*	$Id: msdosfs_denode.c,v 1.8 1995/01/29 01:27:58 ats Exp $ */
 /*	$NetBSD: msdosfs_denode.c,v 1.9 1994/08/21 18:44:00 ws Exp $	*/
 
 /*-
@@ -168,7 +168,6 @@ deget(pmp, dirclust, diroffset, direntptr, depp)
 	int error;
 	dev_t dev = pmp->pm_dev;
 	struct mount *mntp = pmp->pm_mountp;
-	extern int (**msdosfs_vnodeop_p)();
 	struct denode *ldep;
 	struct vnode *nvp;
 	struct buf *bp;
@@ -614,7 +613,6 @@ msdosfs_reclaim(ap)
 {
 	struct vnode *vp = ap->a_vp;
 	struct denode *dep = VTODE(vp);
-	extern int prtactive;
 	
 #ifdef MSDOSFS_DEBUG
 	printf("msdosfs_reclaim(): dep %p, file %s, refcnt %ld\n",
@@ -655,7 +653,6 @@ msdosfs_inactive(ap)
 	struct vnode *vp = ap->a_vp;
 	struct denode *dep = VTODE(vp);
 	int error = 0;
-	extern int prtactive;
 	struct timespec ts;
 	
 #ifdef MSDOSFS_DEBUG
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index 4e13fb2..f7656c4 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -36,7 +36,7 @@
  *	@(#)null_vfsops.c	8.2 (Berkeley) 1/21/94
  *
  * @(#)lofs_vfsops.c	1.2 (Berkeley) 6/18/92
- * $Id: null_vfsops.c,v 1.3 1994/09/22 19:38:14 wollman Exp $
+ * $Id: null_vfsops.c,v 1.4 1994/10/10 07:55:28 phk Exp $
  */
 
 /*
@@ -186,7 +186,6 @@ nullfs_unmount(mp, mntflags, p)
 	struct vnode *nullm_rootvp = MOUNTTONULLMOUNT(mp)->nullm_rootvp;
 	int error;
 	int flags = 0;
-	extern int doforce;
 
 #ifdef NULLFS_DIAGNOSTIC
 	printf("nullfs_unmount(mp = %x)\n", mp);
diff --git a/sys/fs/portalfs/portal_vfsops.c b/sys/fs/portalfs/portal_vfsops.c
index 39d54c2..cad30bd 100644
--- a/sys/fs/portalfs/portal_vfsops.c
+++ b/sys/fs/portalfs/portal_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vfsops.c	8.6 (Berkeley) 1/21/94
  *
- * $Id: portal_vfsops.c,v 1.4 1994/09/23 11:01:58 davidg Exp $
+ * $Id: portal_vfsops.c,v 1.5 1994/10/10 07:55:35 phk Exp $
  */
 
 /*
@@ -155,7 +155,6 @@ portal_unmount(mp, mntflags, p)
 	int mntflags;
 	struct proc *p;
 {
-	extern int doforce;
 	struct vnode *rootvp = VFSTOPORTAL(mp)->pm_root;
 	int error, flags = 0;
 
diff --git a/sys/fs/procfs/procfs.h b/sys/fs/procfs/procfs.h
index 7a1bbb8..79a77da 100644
--- a/sys/fs/procfs/procfs.h
+++ b/sys/fs/procfs/procfs.h
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs.h	8.6 (Berkeley) 2/3/94
  *
- *	$Id: procfs.h,v 1.1.1.1 1994/05/24 10:05:07 rgrimes Exp $
+ *	$Id: procfs.h,v 1.2 1994/08/02 07:45:08 davidg Exp $
  */
 
 /*
@@ -139,6 +139,8 @@ extern int procfs_dostatus __P((struct proc *, struct proc *, struct pfsnode *pf
 extern int (**procfs_vnodeop_p)();
 extern struct vfsops procfs_vfsops;
 
+int	procfs_root __P((struct mount *, struct vnode **));
+
 /*
  * Prototypes for procfs vnode ops
  */
diff --git a/sys/fs/procfs/procfs_ctl.c b/sys/fs/procfs/procfs_ctl.c
index 5902efd..5befe23 100644
--- a/sys/fs/procfs/procfs_ctl.c
+++ b/sys/fs/procfs/procfs_ctl.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_ctl.c	8.3 (Berkeley) 1/21/94
  *
- *	$Id: procfs_ctl.c,v 1.3 1994/12/31 12:26:50 ache Exp $
+ *	$Id: procfs_ctl.c,v 1.4 1995/02/20 15:53:32 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -47,10 +47,15 @@
 #include <sys/vnode.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
+#include <sys/ptrace.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
+#include <sys/signal.h>
+#include <sys/signalvar.h>
+
+#include <vm/vm.h>
+
 #include <miscfs/procfs/procfs.h>
-#include <sys/signal.h>               /* for sigmask() */
 
 /*
  * True iff process (p) is in trace wait state
diff --git a/sys/fs/procfs/procfs_vfsops.c b/sys/fs/procfs/procfs_vfsops.c
index e54d012..4379d0a 100644
--- a/sys/fs/procfs/procfs_vfsops.c
+++ b/sys/fs/procfs/procfs_vfsops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vfsops.c	8.4 (Berkeley) 1/21/94
  *
- *	$Id: procfs_vfsops.c,v 1.6 1994/10/10 07:55:39 phk Exp $
+ *	$Id: procfs_vfsops.c,v 1.7 1995/02/20 15:53:33 davidg Exp $
  */
 
 /*
@@ -104,7 +104,6 @@ procfs_unmount(mp, mntflags, p)
 	struct proc *p;
 {
 	int error;
-	extern int doforce;
 	int flags = 0;
 
 	if (mntflags & MNT_FORCE) {
diff --git a/sys/fs/umapfs/umap_vfsops.c b/sys/fs/umapfs/umap_vfsops.c
index e0baf46..0eeab20 100644
--- a/sys/fs/umapfs/umap_vfsops.c
+++ b/sys/fs/umapfs/umap_vfsops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)umap_vfsops.c	8.3 (Berkeley) 1/21/94
  *
- * $Id: umap_vfsops.c,v 1.4 1994/09/22 19:38:19 wollman Exp $
+ * $Id: umap_vfsops.c,v 1.5 1994/10/10 07:55:43 phk Exp $
  */
 
 /*
@@ -227,7 +227,6 @@ umapfs_unmount(mp, mntflags, p)
 	struct vnode *umapm_rootvp = MOUNTTOUMAPMOUNT(mp)->umapm_rootvp;
 	int error;
 	int flags = 0;
-	extern int doforce;
 
 #ifdef UMAPFS_DIAGNOSTIC
 	printf("umapfs_unmount(mp = %x)\n", mp);
diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h
index b66e17c..05fa481 100644
--- a/sys/fs/unionfs/union.h
+++ b/sys/fs/unionfs/union.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union.h	8.2 (Berkeley) 2/17/94
- * $Id$
+ * $Id: union.h,v 1.2 1994/08/02 07:45:42 davidg Exp $
  */
 
 struct union_args {
@@ -93,12 +93,15 @@ extern int union_allocvp __P((struct vnode **, struct mount *,
 				struct vnode *, struct vnode *,
 				struct componentname *, struct vnode *,
 				struct vnode *));
+extern int union_freevp __P((struct vnode *));
 extern int union_copyfile __P((struct proc *, struct ucred *,
 				struct vnode *, struct vnode *));
 extern int union_mkshadow __P((struct union_mount *, struct vnode *,
 				struct componentname *, struct vnode **));
 extern int union_vn_create __P((struct vnode **, struct union_node *,
 				struct proc *));
+extern int union_vn_close __P((struct vnode *, int, struct ucred *,
+				struct proc *));
 extern int union_cn_close __P((struct vnode *, int, struct ucred *,
 				struct proc *));
 extern void union_removed_upper __P((struct union_node *un));
diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c
index 393fe9d..4000f98 100644
--- a/sys/fs/unionfs/union_vfsops.c
+++ b/sys/fs/unionfs/union_vfsops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.7 (Berkeley) 3/5/94
- * $Id: union_vfsops.c,v 1.6 1994/10/10 07:55:47 phk Exp $
+ * $Id: union_vfsops.c,v 1.7 1994/11/04 14:41:43 davidg Exp $
  */
 
 /*
@@ -56,6 +56,9 @@
 #include <sys/queue.h>
 #include <miscfs/union/union.h>
 
+int	union_root __P((struct mount *, struct vnode **));
+int	union_statfs __P((struct mount *, struct statfs *, struct proc *));
+
 /*
  * Mount union filesystem
  */
@@ -303,7 +306,6 @@ union_unmount(mp, mntflags, p)
 	struct vnode *um_rootvp;
 	int error;
 	int flags = 0;
-	extern int doforce;
 
 #ifdef UNION_DIAGNOSTIC
 	printf("union_unmount(mp = %x)\n", mp);