Moved declarations for static functions to the correct place (not in a

header) and cleaned them up.

4 files changed, 46 insertions, 34 deletions

diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index 05e074562058..6c1ed690372e 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vfsops.c,v 1.8 1995/11/07 14:06:44 phk Exp $ */
+/*	$Id: msdosfs_vfsops.c,v 1.9 1995/11/07 14:10:19 phk Exp $ */
 /*	$NetBSD: msdosfs_vfsops.c,v 1.19 1994/08/21 18:44:10 ws Exp $	*/
 
 /*-
@@ -69,6 +69,26 @@
 
 static int msdosfsdoforce = 1;		/* 1 = force unmount */
 
+static int	mountmsdosfs __P((struct vnode *devvp, struct mount *mp,
+				  struct proc *p));
+static int	msdosfs_fhtovp __P((struct mount *, struct fid *,
+				    struct mbuf *, struct vnode **, int *,
+				    struct ucred **));
+static int	msdosfs_mount __P((struct mount *, char *, caddr_t,
+				   struct nameidata *, struct proc *));
+static int	msdosfs_quotactl __P((struct mount *, int, uid_t, caddr_t,
+				      struct proc *));
+static int	msdosfs_root __P((struct mount *, struct vnode **));
+static int	msdosfs_start __P((struct mount *, int, struct proc *));
+static int	msdosfs_statfs __P((struct mount *, struct statfs *,
+				    struct proc *));
+static int	msdosfs_sync __P((struct mount *, int, struct ucred *,
+				  struct proc *));
+static int	msdosfs_unmount __P((struct mount *, int, struct proc *));
+static int	msdosfs_vget __P((struct mount *mp, ino_t ino,
+				  struct vnode **vpp));
+static int	msdosfs_vptofh __P((struct vnode *, struct fid *));
+
 /*
  * mp - path - addr in user space of mount point (ie /usr or whatever)
  * data - addr in user space of mount params including the name of the block
diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h
index 528bdbd8191d..0d485c49e127 100644
--- a/sys/fs/msdosfs/msdosfsmount.h
+++ b/sys/fs/msdosfs/msdosfsmount.h
@@ -1,4 +1,4 @@
-/*	$Id: msdosfsmount.h,v 1.3 1995/05/30 08:07:47 rgrimes Exp $ */
+/*	$Id: msdosfsmount.h,v 1.4 1995/11/07 14:06:45 phk Exp $ */
 /*	$NetBSD: msdosfsmount.h,v 1.7 1994/08/21 18:44:17 ws Exp $	*/
 
 /*-
@@ -168,18 +168,4 @@ struct msdosfsmount {
 #define	de_clcount(pmp, size) \
 	(((size) + (pmp)->pm_bpcluster - 1) >> (pmp)->pm_cnshift)
 
-/*
- * Prototypes for MSDOSFS virtual filesystem operations
- */
-static int msdosfs_mount __P((struct mount *, char *, caddr_t, struct nameidata *, struct proc *));
-static int msdosfs_start __P((struct mount *, int, struct proc *));
-static int msdosfs_unmount __P((struct mount *, int, struct proc *));
-static int msdosfs_root __P((struct mount *, struct vnode **));
-static int msdosfs_quotactl __P((struct mount *, int, uid_t, caddr_t, struct proc *));
-static int msdosfs_statfs __P((struct mount *, struct statfs *, struct proc *));
-static int msdosfs_sync __P((struct mount *, int, struct ucred *, struct proc *));
-static int msdosfs_fhtovp __P((struct mount *, struct fid *, struct mbuf *, struct vnode **, int *, struct ucred **));
-static int msdosfs_vptofh __P((struct vnode *, struct fid *));
-int msdosfs_init __P(());
-
-static int mountmsdosfs __P((struct vnode *devvp, struct mount *mp, struct proc *p));
+int msdosfs_init __P((void));
diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c
index 05e074562058..6c1ed690372e 100644
--- a/sys/msdosfs/msdosfs_vfsops.c
+++ b/sys/msdosfs/msdosfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vfsops.c,v 1.8 1995/11/07 14:06:44 phk Exp $ */
+/*	$Id: msdosfs_vfsops.c,v 1.9 1995/11/07 14:10:19 phk Exp $ */
 /*	$NetBSD: msdosfs_vfsops.c,v 1.19 1994/08/21 18:44:10 ws Exp $	*/
 
 /*-
@@ -69,6 +69,26 @@
 
 static int msdosfsdoforce = 1;		/* 1 = force unmount */
 
+static int	mountmsdosfs __P((struct vnode *devvp, struct mount *mp,
+				  struct proc *p));
+static int	msdosfs_fhtovp __P((struct mount *, struct fid *,
+				    struct mbuf *, struct vnode **, int *,
+				    struct ucred **));
+static int	msdosfs_mount __P((struct mount *, char *, caddr_t,
+				   struct nameidata *, struct proc *));
+static int	msdosfs_quotactl __P((struct mount *, int, uid_t, caddr_t,
+				      struct proc *));
+static int	msdosfs_root __P((struct mount *, struct vnode **));
+static int	msdosfs_start __P((struct mount *, int, struct proc *));
+static int	msdosfs_statfs __P((struct mount *, struct statfs *,
+				    struct proc *));
+static int	msdosfs_sync __P((struct mount *, int, struct ucred *,
+				  struct proc *));
+static int	msdosfs_unmount __P((struct mount *, int, struct proc *));
+static int	msdosfs_vget __P((struct mount *mp, ino_t ino,
+				  struct vnode **vpp));
+static int	msdosfs_vptofh __P((struct vnode *, struct fid *));
+
 /*
  * mp - path - addr in user space of mount point (ie /usr or whatever)
  * data - addr in user space of mount params including the name of the block
diff --git a/sys/msdosfs/msdosfsmount.h b/sys/msdosfs/msdosfsmount.h
index 528bdbd8191d..0d485c49e127 100644
--- a/sys/msdosfs/msdosfsmount.h
+++ b/sys/msdosfs/msdosfsmount.h
@@ -1,4 +1,4 @@
-/*	$Id: msdosfsmount.h,v 1.3 1995/05/30 08:07:47 rgrimes Exp $ */
+/*	$Id: msdosfsmount.h,v 1.4 1995/11/07 14:06:45 phk Exp $ */
 /*	$NetBSD: msdosfsmount.h,v 1.7 1994/08/21 18:44:17 ws Exp $	*/
 
 /*-
@@ -168,18 +168,4 @@ struct msdosfsmount {
 #define	de_clcount(pmp, size) \
 	(((size) + (pmp)->pm_bpcluster - 1) >> (pmp)->pm_cnshift)
 
-/*
- * Prototypes for MSDOSFS virtual filesystem operations
- */
-static int msdosfs_mount __P((struct mount *, char *, caddr_t, struct nameidata *, struct proc *));
-static int msdosfs_start __P((struct mount *, int, struct proc *));
-static int msdosfs_unmount __P((struct mount *, int, struct proc *));
-static int msdosfs_root __P((struct mount *, struct vnode **));
-static int msdosfs_quotactl __P((struct mount *, int, uid_t, caddr_t, struct proc *));
-static int msdosfs_statfs __P((struct mount *, struct statfs *, struct proc *));
-static int msdosfs_sync __P((struct mount *, int, struct ucred *, struct proc *));
-static int msdosfs_fhtovp __P((struct mount *, struct fid *, struct mbuf *, struct vnode **, int *, struct ucred **));
-static int msdosfs_vptofh __P((struct vnode *, struct fid *));
-int msdosfs_init __P(());
-
-static int mountmsdosfs __P((struct vnode *devvp, struct mount *mp, struct proc *p));
+int msdosfs_init __P((void));