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.

6 files changed, 12 insertions, 17 deletions

diff --git a/sys/nfsclient/nfs_node.c b/sys/nfsclient/nfs_node.c
index 909f9e0..e5315f4 100644
--- a/sys/nfsclient/nfs_node.c
+++ b/sys/nfsclient/nfs_node.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_node.c	8.2 (Berkeley) 12/30/93
- * $Id: nfs_node.c,v 1.6 1994/10/06 21:06:56 davidg Exp $
+ * $Id: nfs_node.c,v 1.7 1994/10/17 17:47:33 phk Exp $
  */
 
 #include <sys/param.h>
@@ -109,7 +109,6 @@ nfs_nget(mntp, fhp, npp)
 	register struct nfsnode *np;
 	struct nfsnodehashhead *nhpp;
 	register struct vnode *vp;
-	extern int (**nfsv2_vnodeop_p)();
 	struct vnode *nvp;
 	int error;
 
@@ -165,7 +164,6 @@ nfs_inactive(ap)
 	register struct nfsnode *np;
 	register struct sillyrename *sp;
 	struct proc *p = curproc;	/* XXX */
-	extern int prtactive;
 
 	np = VTONFS(ap->a_vp);
 	if (prtactive && ap->a_vp->v_usecount != 0)
@@ -201,7 +199,6 @@ nfs_reclaim(ap)
 	register struct vnode *vp = ap->a_vp;
 	register struct nfsnode *np = VTONFS(vp);
 	register struct nfsmount *nmp = VFSTONFS(vp->v_mount);
-	extern int prtactive;
 
 	if (prtactive && vp->v_usecount != 0)
 		vprint("nfs_reclaim: pushing active", vp);
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index 27c4561..ccd187a 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_socket.c	8.3 (Berkeley) 1/12/94
- * $Id: nfs_socket.c,v 1.4 1994/10/02 17:26:59 phk Exp $
+ * $Id: nfs_socket.c,v 1.5 1994/10/17 17:47:35 phk Exp $
  */
 
 /*
@@ -68,8 +68,6 @@
 #include <nfs/nfsrtt.h>
 #include <nfs/nqnfs.h>
 
-#include <machine/clock.h>	/* for inittodr */
-
 #define	TRUE	1
 #define	FALSE	0
 
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index d1c11c4..03b0b03 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.10 1995/02/15 03:40:00 davidg Exp $
+ * $Id: nfs_subs.c,v 1.11 1995/02/15 04:21:32 phk Exp $
  */
 
 /*
@@ -690,7 +690,6 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper)
 	register struct vnode *vp = *vpp;
 	register struct vattr *vap;
 	register struct nfsv2_fattr *fp;
-	extern int (**spec_nfsv2nodeop_p)();
 	register struct nfsnode *np;
 	register struct nfsnodehashhead *nhpp;
 	register long t1;
@@ -736,7 +735,6 @@ nfs_loadattrcache(vpp, mdp, dposp, vaper)
 		else
 			vp->v_type = vtyp;
 		if (vp->v_type == VFIFO) {
-			extern int (**fifo_nfsv2nodeop_p)();
 			vp->v_op = fifo_nfsv2nodeop_p;
 		}
 		if (vp->v_type == VCHR || vp->v_type == VBLK) {
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c
index dc4c789..9742bd4 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vfsops.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_vfsops.c,v 1.9 1994/12/08 20:59:33 phk Exp $
+ * $Id: nfs_vfsops.c,v 1.10 1995/01/03 07:44:10 jkh Exp $
  */
 
 #include <sys/param.h>
@@ -52,6 +52,8 @@
 #include <sys/socketvar.h>
 #include <sys/systm.h>
 
+#include <vm/vm.h>
+
 #include <net/if.h>
 #include <net/route.h>
 #include <netinet/in.h>
@@ -579,7 +581,6 @@ nfs_unmount(mp, mntflags, p)
 	struct nfsnode *np;
 	struct vnode *vp;
 	int error, flags = 0;
-	extern int doforce;
 
 	if (mntflags & MNT_FORCE) {
 		if (!doforce)
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 2986b51..b4a9baf 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.5 (Berkeley) 2/13/94
- * $Id: nfs_vnops.c,v 1.11 1995/01/09 16:05:09 davidg Exp $
+ * $Id: nfs_vnops.c,v 1.12 1995/02/03 06:46:24 davidg Exp $
  */
 
 /*
@@ -2510,7 +2510,6 @@ nfsfifo_read(ap)
 		struct ucred *a_cred;
 	} */ *ap;
 {
-	extern int (**fifo_vnodeop_p)();
 	register struct nfsnode *np = VTONFS(ap->a_vp);
 
 	/*
@@ -2533,7 +2532,6 @@ nfsfifo_write(ap)
 		struct ucred *a_cred;
 	} */ *ap;
 {
-	extern int (**fifo_vnodeop_p)();
 	register struct nfsnode *np = VTONFS(ap->a_vp);
 
 	/*
@@ -2561,7 +2559,6 @@ nfsfifo_close(ap)
 	register struct vnode *vp = ap->a_vp;
 	register struct nfsnode *np = VTONFS(vp);
 	struct vattr vattr;
-	extern int (**fifo_vnodeop_p)();
 
 	if (np->n_flag & (NACC | NUPD)) {
 		if (np->n_flag & NACC)
diff --git a/sys/nfsclient/nfsnode.h b/sys/nfsclient/nfsnode.h
index 01d0969..dc9162b 100644
--- a/sys/nfsclient/nfsnode.h
+++ b/sys/nfsclient/nfsnode.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.4 (Berkeley) 2/13/94
- * $Id: nfsnode.h,v 1.7 1994/10/02 17:27:06 phk Exp $
+ * $Id: nfsnode.h,v 1.8 1994/10/17 17:47:44 phk Exp $
  */
 
 #ifndef _NFS_NFSNODE_H_
@@ -108,6 +108,10 @@ struct nfsnode {
 TAILQ_HEAD(, buf) nfs_bufq;
 
 #ifdef KERNEL
+extern	int	(**fifo_nfsv2nodeop_p)();
+extern	int	(**nfsv2_vnodeop_p)();
+extern	int	(**spec_nfsv2nodeop_p)();
+
 /*
  * Prototypes for NFS vnode operations
  */