Staticize.

13 files changed, 147 insertions, 137 deletions

diff --git a/sys/gnu/ext2fs/ext2_extern.h b/sys/gnu/ext2fs/ext2_extern.h
index ea83912..5b9623f 100644
--- a/sys/gnu/ext2fs/ext2_extern.h
+++ b/sys/gnu/ext2fs/ext2_extern.h
@@ -65,28 +65,14 @@ int	ext2_blkatoff __P((struct vop_blkatoff_args *));
 void	ext2_blkfree __P((struct inode *, daddr_t, long));
 daddr_t	ext2_blkpref __P((struct inode *, daddr_t, int, daddr_t *, daddr_t));
 int	ext2_bmap __P((struct vop_bmap_args *));
-int	ext2_fhtovp __P((struct mount *, struct fid *, struct mbuf *,
-	    struct vnode **, int *, struct ucred **));
-int	ext2_fsync __P((struct vop_fsync_args *));
 int	ext2_init __P((void));
-int	ext2_mount __P((struct mount *,
-	    char *, caddr_t, struct nameidata *, struct proc *));
-int	ext2_mountfs __P((struct vnode *, struct mount *, struct proc *));
-int	ext2_mountroot __P((void));
-int	ext2_read __P((struct vop_read_args *));
 int	ext2_reallocblks __P((struct vop_reallocblks_args *));
 int	ext2_reclaim __P((struct vop_reclaim_args *));
 void	ext2_setblock __P((struct ext2_sb_info *, u_char *, daddr_t));
-int	ext2_statfs __P((struct mount *, struct statfs *, struct proc *));
-int	ext2_sync __P((struct mount *, int, struct ucred *, struct proc *));
 int	ext2_truncate __P((struct vop_truncate_args *));
-int	ext2_unmount __P((struct mount *, int, struct proc *));
 int	ext2_update __P((struct vop_update_args *));
 int	ext2_valloc __P((struct vop_valloc_args *));
 int	ext2_vfree __P((struct vop_vfree_args *));
-int	ext2_vget __P((struct mount *, ino_t, struct vnode **));
-int	ext2_vptofh __P((struct vnode *, struct fid *));
-int	ext2_write __P((struct vop_write_args *));
 int 	ext2_lookup __P((struct vop_lookup_args *));
 int 	ext2_readdir __P((struct vop_readdir_args *));
 void	ext2_print_dinode __P((struct dinode *));
@@ -111,9 +97,6 @@ unsigned long ext2_count_free __P((struct buf *map, unsigned int numchars));
 void	ext2_free_blocks (struct mount * mp, unsigned long block,
 		       unsigned long count);
 void	ext2_free_inode (struct inode * inode);
-int	ext2_flushfiles __P((struct mount *mp, int flags, struct proc *p));
-int	ext2_reload __P((struct mount *mountp, struct ucred *cred,
-			struct proc *p));
 void	ext2_ei2di __P((struct ext2_inode *ei, struct dinode *di));
 void	ext2_di2ei __P((struct dinode *di, struct ext2_inode *ei));
 void	mark_buffer_dirty __P((struct buf *bh));
diff --git a/sys/gnu/ext2fs/ext2_readwrite.c b/sys/gnu/ext2fs/ext2_readwrite.c
index 8deb0b1..093f7fb 100644
--- a/sys/gnu/ext2fs/ext2_readwrite.c
+++ b/sys/gnu/ext2fs/ext2_readwrite.c
@@ -55,7 +55,7 @@
  * Vnode op for reading.
  */
 /* ARGSUSED */
-int
+static int
 READ(ap)
 	struct vop_read_args /* {
 		struct vnode *a_vp;
@@ -159,7 +159,7 @@ READ(ap)
 /*
  * Vnode op for writing.
  */
-int
+static int
 WRITE(ap)
 	struct vop_write_args /* {
 		struct vnode *a_vp;
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index 09f4282..1054e49 100644
--- a/sys/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/ext2fs/ext2_vfsops.c
@@ -72,9 +72,23 @@
 #include <gnu/ext2fs/ext2_fs.h>
 #include <gnu/ext2fs/ext2_fs_sb.h>
 
-int ext2_sbupdate __P((struct ufsmount *, int));
+static int ext2_fhtovp __P((struct mount *, struct fid *, struct mbuf *,
+	    struct vnode **, int *, struct ucred **));
+static int ext2_flushfiles __P((struct mount *mp, int flags, struct proc *p));
+static int ext2_mount __P((struct mount *,
+	    char *, caddr_t, struct nameidata *, struct proc *));
+static int ext2_mountfs __P((struct vnode *, struct mount *, struct proc *));
+static int ext2_mountroot __P((void));
+static int ext2_reload __P((struct mount *mountp, struct ucred *cred,
+			struct proc *p));
+static int ext2_sbupdate __P((struct ufsmount *, int));
+static int ext2_statfs __P((struct mount *, struct statfs *, struct proc *));
+static int ext2_sync __P((struct mount *, int, struct ucred *, struct proc *));
+static int ext2_unmount __P((struct mount *, int, struct proc *));
+static int ext2_vget __P((struct mount *, ino_t, struct vnode **));
+static int ext2_vptofh __P((struct vnode *, struct fid *));
 
-struct vfsops ext2fs_vfsops = {
+static struct vfsops ext2fs_vfsops = {
 	ext2_mount,
 	ufs_start,		/* empty function */
 	ext2_unmount,
@@ -96,7 +110,7 @@ VFS_SET(ext2fs_vfsops, ext2fs, MOUNT_EXT2FS, 0);
 
 extern u_long nextgennumber;
 #ifdef __FreeBSD__
-int ext2fs_inode_hash_lock;
+static int ext2fs_inode_hash_lock;
 #endif
 
 /*
@@ -110,7 +124,7 @@ static int	compute_sb_data __P((struct vnode * devvp,
 				     struct ext2_super_block * es,
 				     struct ext2_sb_info * fs));
 
-int
+static int
 ext2_mountroot()
 {
 #if !defined(__FreeBSD__)
@@ -173,7 +187,7 @@ ext2_mountroot()
  *
  * mount system call
  */
-int
+static int
 ext2_mount(mp, path, data, ndp, p)
 	register struct mount *mp;	
 	char *path;
@@ -431,7 +445,7 @@ static int compute_sb_data(devvp, es, fs)
  *	5) invalidate all cached file data.
  *	6) re-read inode data for all active vnodes.
  */
-int
+static int
 ext2_reload(mountp, cred, p)
 	register struct mount *mountp;
 	struct ucred *cred;
@@ -524,7 +538,7 @@ loop:
 /*
  * Common code for mount and mountroot
  */
-int
+static int
 ext2_mountfs(devvp, mp, p)
 	register struct vnode *devvp;
 	struct mount *mp;
@@ -651,7 +665,7 @@ out:
 /*
  * unmount system call
  */
-int
+static int
 ext2_unmount(mp, mntflags, p)
 	struct mount *mp;
 	int mntflags;
@@ -702,7 +716,7 @@ ext2_unmount(mp, mntflags, p)
 /*
  * Flush out all the files in a filesystem.
  */
-int
+static int
 ext2_flushfiles(mp, flags, p)
 	register struct mount *mp;
 	int flags;
@@ -743,7 +757,7 @@ ext2_flushfiles(mp, flags, p)
  * Get file system statistics.
  * taken from ext2/super.c ext2_statfs
  */
-int
+static int
 ext2_statfs(mp, sbp, p)
 	struct mount *mp;
 	register struct statfs *sbp;
@@ -798,7 +812,7 @@ ext2_statfs(mp, sbp, p)
  *
  * Note: we are always called with the filesystem marked `MPBUSY'.
  */
-int
+static int
 ext2_sync(mp, waitfor, cred, p)
 	struct mount *mp;
 	int waitfor;
@@ -876,7 +890,7 @@ loop:
  * return the inode locked.  Detection and handling of mount points must be
  * done by the calling routine.
  */
-int
+static int
 ext2_vget(mp, ino, vpp)
 	struct mount *mp;
 	ino_t ino;
@@ -1034,7 +1048,7 @@ printf("ext2_vget(%d) dbn= %d ", ino, fsbtodb(fs, ino_to_fsba(fs, ino)));
  * - check that the given client host has export rights and return
  *   those rights via. exflagsp and credanonp
  */
-int
+static int
 ext2_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
 	register struct mount *mp;
 	struct fid *fhp;
@@ -1058,7 +1072,7 @@ ext2_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
  * Vnode pointer to File handle
  */
 /* ARGSUSED */
-int
+static int
 ext2_vptofh(vp, fhp)
 	struct vnode *vp;
 	struct fid *fhp;
@@ -1077,7 +1091,7 @@ ext2_vptofh(vp, fhp)
 /*
  * Write a superblock and associated information back to disk.
  */
-int
+static int
 ext2_sbupdate(mp, waitfor)
 	struct ufsmount *mp;
 	int waitfor;
diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c
index 681097e..bdbafa0 100644
--- a/sys/gnu/ext2fs/ext2_vnops.c
+++ b/sys/gnu/ext2fs/ext2_vnops.c
@@ -79,9 +79,13 @@
 #include <gnu/ext2fs/fs.h>
 #include <gnu/ext2fs/ext2_extern.h>
 
+static int ext2_fsync __P((struct vop_fsync_args *));
+static int ext2_read __P((struct vop_read_args *));
+static int ext2_write __P((struct vop_write_args *));
+
 /* Global vfs data structures for ufs. */
 vop_t **ext2_vnodeop_p;
-struct vnodeopv_entry_desc ext2_vnodeop_entries[] = {
+static struct vnodeopv_entry_desc ext2_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)ext2_lookup },	/* lookup */
 	{ &vop_create_desc, (vop_t *)ufs_create },	/* create */
@@ -126,11 +130,11 @@ struct vnodeopv_entry_desc ext2_vnodeop_entries[] = {
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
-struct vnodeopv_desc ext2fs_vnodeop_opv_desc =
+static struct vnodeopv_desc ext2fs_vnodeop_opv_desc =
 	{ &ext2_vnodeop_p, ext2_vnodeop_entries };
 
 vop_t **ext2_specop_p;
-struct vnodeopv_entry_desc ext2_specop_entries[] = {
+static struct vnodeopv_entry_desc ext2_specop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
 	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
@@ -175,11 +179,11 @@ struct vnodeopv_entry_desc ext2_specop_entries[] = {
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
-struct vnodeopv_desc ext2fs_specop_opv_desc =
+static struct vnodeopv_desc ext2fs_specop_opv_desc =
 	{ &ext2_specop_p, ext2_specop_entries };
 
 vop_t **ext2_fifoop_p;
-struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
+static struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
 	{ &vop_create_desc, (vop_t *)fifo_create },	/* create */
@@ -224,7 +228,7 @@ struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
-struct vnodeopv_desc ext2fs_fifoop_opv_desc =
+static struct vnodeopv_desc ext2fs_fifoop_opv_desc =
 	{ &ext2_fifoop_p, ext2_fifoop_entries };
 
 #if defined(__FreeBSD__)
@@ -238,9 +242,9 @@ struct vnodeopv_desc ext2fs_fifoop_opv_desc =
  */
 #ifdef DEBUG
 #include <sys/sysctl.h>
-int doclusterread = 1;
+static int doclusterread = 1;
 SYSCTL_INT(_debug, 11, doclusterread, CTLFLAG_RW, &doclusterread, 0, "");
-int doclusterwrite = 1;
+static int doclusterwrite = 1;
 SYSCTL_INT(_debug, 12, doclusterwrite, CTLFLAG_RW, &doclusterwrite, 0, "");
 #endif
 
@@ -261,7 +265,7 @@ SYSCTL_INT(_debug, 12, doclusterwrite, CTLFLAG_RW, &doclusterwrite, 0, "");
  * Synch an open file.
  */
 /* ARGSUSED */
-int
+static int
 ext2_fsync(ap)
 	struct vop_fsync_args /* {
 		struct vnode *a_vp;
diff --git a/sys/gnu/fs/ext2fs/ext2_extern.h b/sys/gnu/fs/ext2fs/ext2_extern.h
index ea83912..5b9623f 100644
--- a/sys/gnu/fs/ext2fs/ext2_extern.h
+++ b/sys/gnu/fs/ext2fs/ext2_extern.h
@@ -65,28 +65,14 @@ int	ext2_blkatoff __P((struct vop_blkatoff_args *));
 void	ext2_blkfree __P((struct inode *, daddr_t, long));
 daddr_t	ext2_blkpref __P((struct inode *, daddr_t, int, daddr_t *, daddr_t));
 int	ext2_bmap __P((struct vop_bmap_args *));
-int	ext2_fhtovp __P((struct mount *, struct fid *, struct mbuf *,
-	    struct vnode **, int *, struct ucred **));
-int	ext2_fsync __P((struct vop_fsync_args *));
 int	ext2_init __P((void));
-int	ext2_mount __P((struct mount *,
-	    char *, caddr_t, struct nameidata *, struct proc *));
-int	ext2_mountfs __P((struct vnode *, struct mount *, struct proc *));
-int	ext2_mountroot __P((void));
-int	ext2_read __P((struct vop_read_args *));
 int	ext2_reallocblks __P((struct vop_reallocblks_args *));
 int	ext2_reclaim __P((struct vop_reclaim_args *));
 void	ext2_setblock __P((struct ext2_sb_info *, u_char *, daddr_t));
-int	ext2_statfs __P((struct mount *, struct statfs *, struct proc *));
-int	ext2_sync __P((struct mount *, int, struct ucred *, struct proc *));
 int	ext2_truncate __P((struct vop_truncate_args *));
-int	ext2_unmount __P((struct mount *, int, struct proc *));
 int	ext2_update __P((struct vop_update_args *));
 int	ext2_valloc __P((struct vop_valloc_args *));
 int	ext2_vfree __P((struct vop_vfree_args *));
-int	ext2_vget __P((struct mount *, ino_t, struct vnode **));
-int	ext2_vptofh __P((struct vnode *, struct fid *));
-int	ext2_write __P((struct vop_write_args *));
 int 	ext2_lookup __P((struct vop_lookup_args *));
 int 	ext2_readdir __P((struct vop_readdir_args *));
 void	ext2_print_dinode __P((struct dinode *));
@@ -111,9 +97,6 @@ unsigned long ext2_count_free __P((struct buf *map, unsigned int numchars));
 void	ext2_free_blocks (struct mount * mp, unsigned long block,
 		       unsigned long count);
 void	ext2_free_inode (struct inode * inode);
-int	ext2_flushfiles __P((struct mount *mp, int flags, struct proc *p));
-int	ext2_reload __P((struct mount *mountp, struct ucred *cred,
-			struct proc *p));
 void	ext2_ei2di __P((struct ext2_inode *ei, struct dinode *di));
 void	ext2_di2ei __P((struct dinode *di, struct ext2_inode *ei));
 void	mark_buffer_dirty __P((struct buf *bh));
diff --git a/sys/gnu/fs/ext2fs/ext2_readwrite.c b/sys/gnu/fs/ext2fs/ext2_readwrite.c
index 8deb0b1..093f7fb 100644
--- a/sys/gnu/fs/ext2fs/ext2_readwrite.c
+++ b/sys/gnu/fs/ext2fs/ext2_readwrite.c
@@ -55,7 +55,7 @@
  * Vnode op for reading.
  */
 /* ARGSUSED */
-int
+static int
 READ(ap)
 	struct vop_read_args /* {
 		struct vnode *a_vp;
@@ -159,7 +159,7 @@ READ(ap)
 /*
  * Vnode op for writing.
  */
-int
+static int
 WRITE(ap)
 	struct vop_write_args /* {
 		struct vnode *a_vp;
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index 09f4282..1054e49 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -72,9 +72,23 @@
 #include <gnu/ext2fs/ext2_fs.h>
 #include <gnu/ext2fs/ext2_fs_sb.h>
 
-int ext2_sbupdate __P((struct ufsmount *, int));
+static int ext2_fhtovp __P((struct mount *, struct fid *, struct mbuf *,
+	    struct vnode **, int *, struct ucred **));
+static int ext2_flushfiles __P((struct mount *mp, int flags, struct proc *p));
+static int ext2_mount __P((struct mount *,
+	    char *, caddr_t, struct nameidata *, struct proc *));
+static int ext2_mountfs __P((struct vnode *, struct mount *, struct proc *));
+static int ext2_mountroot __P((void));
+static int ext2_reload __P((struct mount *mountp, struct ucred *cred,
+			struct proc *p));
+static int ext2_sbupdate __P((struct ufsmount *, int));
+static int ext2_statfs __P((struct mount *, struct statfs *, struct proc *));
+static int ext2_sync __P((struct mount *, int, struct ucred *, struct proc *));
+static int ext2_unmount __P((struct mount *, int, struct proc *));
+static int ext2_vget __P((struct mount *, ino_t, struct vnode **));
+static int ext2_vptofh __P((struct vnode *, struct fid *));
 
-struct vfsops ext2fs_vfsops = {
+static struct vfsops ext2fs_vfsops = {
 	ext2_mount,
 	ufs_start,		/* empty function */
 	ext2_unmount,
@@ -96,7 +110,7 @@ VFS_SET(ext2fs_vfsops, ext2fs, MOUNT_EXT2FS, 0);
 
 extern u_long nextgennumber;
 #ifdef __FreeBSD__
-int ext2fs_inode_hash_lock;
+static int ext2fs_inode_hash_lock;
 #endif
 
 /*
@@ -110,7 +124,7 @@ static int	compute_sb_data __P((struct vnode * devvp,
 				     struct ext2_super_block * es,
 				     struct ext2_sb_info * fs));
 
-int
+static int
 ext2_mountroot()
 {
 #if !defined(__FreeBSD__)
@@ -173,7 +187,7 @@ ext2_mountroot()
  *
  * mount system call
  */
-int
+static int
 ext2_mount(mp, path, data, ndp, p)
 	register struct mount *mp;	
 	char *path;
@@ -431,7 +445,7 @@ static int compute_sb_data(devvp, es, fs)
  *	5) invalidate all cached file data.
  *	6) re-read inode data for all active vnodes.
  */
-int
+static int
 ext2_reload(mountp, cred, p)
 	register struct mount *mountp;
 	struct ucred *cred;
@@ -524,7 +538,7 @@ loop:
 /*
  * Common code for mount and mountroot
  */
-int
+static int
 ext2_mountfs(devvp, mp, p)
 	register struct vnode *devvp;
 	struct mount *mp;
@@ -651,7 +665,7 @@ out:
 /*
  * unmount system call
  */
-int
+static int
 ext2_unmount(mp, mntflags, p)
 	struct mount *mp;
 	int mntflags;
@@ -702,7 +716,7 @@ ext2_unmount(mp, mntflags, p)
 /*
  * Flush out all the files in a filesystem.
  */
-int
+static int
 ext2_flushfiles(mp, flags, p)
 	register struct mount *mp;
 	int flags;
@@ -743,7 +757,7 @@ ext2_flushfiles(mp, flags, p)
  * Get file system statistics.
  * taken from ext2/super.c ext2_statfs
  */
-int
+static int
 ext2_statfs(mp, sbp, p)
 	struct mount *mp;
 	register struct statfs *sbp;
@@ -798,7 +812,7 @@ ext2_statfs(mp, sbp, p)
  *
  * Note: we are always called with the filesystem marked `MPBUSY'.
  */
-int
+static int
 ext2_sync(mp, waitfor, cred, p)
 	struct mount *mp;
 	int waitfor;
@@ -876,7 +890,7 @@ loop:
  * return the inode locked.  Detection and handling of mount points must be
  * done by the calling routine.
  */
-int
+static int
 ext2_vget(mp, ino, vpp)
 	struct mount *mp;
 	ino_t ino;
@@ -1034,7 +1048,7 @@ printf("ext2_vget(%d) dbn= %d ", ino, fsbtodb(fs, ino_to_fsba(fs, ino)));
  * - check that the given client host has export rights and return
  *   those rights via. exflagsp and credanonp
  */
-int
+static int
 ext2_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
 	register struct mount *mp;
 	struct fid *fhp;
@@ -1058,7 +1072,7 @@ ext2_fhtovp(mp, fhp, nam, vpp, exflagsp, credanonp)
  * Vnode pointer to File handle
  */
 /* ARGSUSED */
-int
+static int
 ext2_vptofh(vp, fhp)
 	struct vnode *vp;
 	struct fid *fhp;
@@ -1077,7 +1091,7 @@ ext2_vptofh(vp, fhp)
 /*
  * Write a superblock and associated information back to disk.
  */
-int
+static int
 ext2_sbupdate(mp, waitfor)
 	struct ufsmount *mp;
 	int waitfor;
diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c
index 681097e..bdbafa0 100644
--- a/sys/gnu/fs/ext2fs/ext2_vnops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vnops.c
@@ -79,9 +79,13 @@
 #include <gnu/ext2fs/fs.h>
 #include <gnu/ext2fs/ext2_extern.h>
 
+static int ext2_fsync __P((struct vop_fsync_args *));
+static int ext2_read __P((struct vop_read_args *));
+static int ext2_write __P((struct vop_write_args *));
+
 /* Global vfs data structures for ufs. */
 vop_t **ext2_vnodeop_p;
-struct vnodeopv_entry_desc ext2_vnodeop_entries[] = {
+static struct vnodeopv_entry_desc ext2_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)ext2_lookup },	/* lookup */
 	{ &vop_create_desc, (vop_t *)ufs_create },	/* create */
@@ -126,11 +130,11 @@ struct vnodeopv_entry_desc ext2_vnodeop_entries[] = {
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
-struct vnodeopv_desc ext2fs_vnodeop_opv_desc =
+static struct vnodeopv_desc ext2fs_vnodeop_opv_desc =
 	{ &ext2_vnodeop_p, ext2_vnodeop_entries };
 
 vop_t **ext2_specop_p;
-struct vnodeopv_entry_desc ext2_specop_entries[] = {
+static struct vnodeopv_entry_desc ext2_specop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
 	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
@@ -175,11 +179,11 @@ struct vnodeopv_entry_desc ext2_specop_entries[] = {
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
-struct vnodeopv_desc ext2fs_specop_opv_desc =
+static struct vnodeopv_desc ext2fs_specop_opv_desc =
 	{ &ext2_specop_p, ext2_specop_entries };
 
 vop_t **ext2_fifoop_p;
-struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
+static struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
 	{ &vop_create_desc, (vop_t *)fifo_create },	/* create */
@@ -224,7 +228,7 @@ struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
-struct vnodeopv_desc ext2fs_fifoop_opv_desc =
+static struct vnodeopv_desc ext2fs_fifoop_opv_desc =
 	{ &ext2_fifoop_p, ext2_fifoop_entries };
 
 #if defined(__FreeBSD__)
@@ -238,9 +242,9 @@ struct vnodeopv_desc ext2fs_fifoop_opv_desc =
  */
 #ifdef DEBUG
 #include <sys/sysctl.h>
-int doclusterread = 1;
+static int doclusterread = 1;
 SYSCTL_INT(_debug, 11, doclusterread, CTLFLAG_RW, &doclusterread, 0, "");
-int doclusterwrite = 1;
+static int doclusterwrite = 1;
 SYSCTL_INT(_debug, 12, doclusterwrite, CTLFLAG_RW, &doclusterwrite, 0, "");
 #endif
 
@@ -261,7 +265,7 @@ SYSCTL_INT(_debug, 12, doclusterwrite, CTLFLAG_RW, &doclusterwrite, 0, "");
  * Synch an open file.
  */
 /* ARGSUSED */
-int
+static int
 ext2_fsync(ap)
 	struct vop_fsync_args /* {
 		struct vnode *a_vp;
diff --git a/sys/gnu/i386/fpemul/fpu_proto.h b/sys/gnu/i386/fpemul/fpu_proto.h
index a6e9c02..c44a026 100644
--- a/sys/gnu/i386/fpemul/fpu_proto.h
+++ b/sys/gnu/i386/fpemul/fpu_proto.h
@@ -1,6 +1,6 @@
 /*
  *
- *    $Id: fpu_proto.h,v 1.3 1995/03/16 18:11:11 bde Exp $
+ *    $Id: fpu_proto.h,v 1.4 1995/12/14 09:50:23 phk Exp $
  *
  */
 
@@ -58,7 +58,6 @@ extern int math_emulate(struct trapframe * info);
 /* fpu_etc.c */
 extern void fp_etc(void);
 /* fpu_trig.c */
-extern void convert_l2reg(long *arg, FPU_REG * dest);
 extern void trig_a(void);
 extern void trig_b(void);
 /* get_address.c */
diff --git a/sys/gnu/i386/fpemul/fpu_trig.c b/sys/gnu/i386/fpemul/fpu_trig.c
index ca32f91..4dc8101 100644
--- a/sys/gnu/i386/fpemul/fpu_trig.c
+++ b/sys/gnu/i386/fpemul/fpu_trig.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: fpu_trig.c,v 1.3 1994/04/29 21:16:25 gclarkii Exp $
+ *    $Id: fpu_trig.c,v 1.4 1994/06/10 07:44:27 rich Exp $
  *
  */
 
@@ -73,6 +73,8 @@
 #include "reg_constant.h"
 #include "control_w.h"
 
+static void convert_l2reg(long *arg, FPU_REG * dest);
+
 static int
 trig_arg(FPU_REG * X)
 {
@@ -104,7 +106,7 @@ trig_arg(FPU_REG * X)
 
 
 /* Convert a long to register */
-void
+static void
 convert_l2reg(long *arg, FPU_REG * dest)
 {
 	long    num = *arg;
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index 6dd2a25..e96cbc7 100644
--- a/sys/gnu/i386/isa/dgb.c
+++ b/sys/gnu/i386/isa/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.12 1995/12/10 15:54:01 bde Exp $
+ *  dgb.c $Id: dgb.c,v 1.13 1995/12/10 20:54:21 bde Exp $
  *
  *  Digiboard driver.
  *
@@ -37,6 +37,7 @@
 #include <sys/file.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
+#include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 #include <sys/devconf.h>
@@ -157,9 +158,9 @@ struct dgb_softc {
 	};
 	
 
-struct dgb_softc dgb_softc[NDGB];
-struct dgb_p dgb_ports[NDGBPORTS];
-struct tty dgb_tty[NDGBPORTS];
+static struct dgb_softc dgb_softc[NDGB];
+static struct dgb_p dgb_ports[NDGBPORTS];
+static struct tty dgb_tty[NDGBPORTS];
 
 /*
  * The public functions in the com module ought to be declared in a com-driver
@@ -167,8 +168,8 @@ struct tty dgb_tty[NDGBPORTS];
  */
 
 /* Interrupt handling entry points. */
-void	dgbintr		__P((int unit));
-void	dgbpoll		__P((void *unit_c));
+static void	dgbintr		__P((int unit));
+static void	dgbpoll		__P((void *unit_c));
 
 /* Device switch entry points. */
 #define	dgbreset	noreset
@@ -235,11 +236,10 @@ static	struct speedtab dgbspeedtab[] = {
 	-1,	-1
 };
 
-#ifdef DEBUG
-	int dgbdebug=1;
-#else
-	int dgbdebug=0;
-#endif
+static int dgbdebug=0;
+SYSCTL_INT(_debug, OID_AUTO, dgb_debug, CTLFLAG_RW,
+	&dgbdebug, 0, "");
+
 
 static int polltimeout=0;
 
@@ -1178,7 +1178,8 @@ dgbwrite(dev, uio, flag)
 	return error;
 }
 
-void dgbpoll(unit_c)
+static void
+dgbpoll(unit_c)
 	void *unit_c;
 {
 	int unit=(int)unit_c;
@@ -1399,7 +1400,7 @@ void dgbpoll(unit_c)
 	timeout(dgbpoll, unit_c, hz/25);
 }
 
-void
+static void
 dgbintr(unit)
 	int	unit;
 {
diff --git a/sys/gnu/i386/isa/nic3008.c b/sys/gnu/i386/isa/nic3008.c
index d6edea3..27bd01b 100644
--- a/sys/gnu/i386/isa/nic3008.c
+++ b/sys/gnu/i386/isa/nic3008.c
@@ -1,6 +1,6 @@
-static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.12 1995/12/08 11:12:45 julian Exp $";
+static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.13 1995/12/08 23:19:29 phk Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.12 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.13 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,9 @@ static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.12 1995/12/08 11:12:45 juli
  *
  *******************************************************************************
  * $Log: nic3008.c,v $
+ * Revision 1.13  1995/12/08  23:19:29  phk
+ * Julian forgot to make the *devsw structures static.
+ *
  * Revision 1.12  1995/12/08  11:12:45  julian
  * Pass 3 of the great devsw changes
  * most devsw referenced functions are now static, as they are
@@ -138,17 +141,17 @@ extern int Isdn_Appl, Isdn_Ctrl, Isdn_Typ;
 
 static old_spy= 0;
 
-extern int	nicattach __P((struct isa_device *is));
-extern int	nicprobe __P((struct isa_device *is));
-extern int	nic_accept __P((int cn, int an, int rea));
-extern int	nic_connect __P((int cn, int ap, int b_channel, int inf_mask,
+static int	nicattach __P((struct isa_device *is));
+static int	nicprobe __P((struct isa_device *is));
+static int	nic_accept __P((int cn, int an, int rea));
+static int	nic_connect __P((int cn, int ap, int b_channel, int inf_mask,
 				 int out_serv, int out_serv_add,
 				 int src_subadr, unsigned ad_len,
 				 char *dest_addr, int spv));
-extern int	nic_disconnect __P((int cn, int rea));
-extern int	nic_listen __P((int cn, int ap, int inf_mask, int subadr_mask,
+static int	nic_disconnect __P((int cn, int rea));
+static int	nic_listen __P((int cn, int ap, int inf_mask, int subadr_mask,
 				int si_mask, int spv));
-extern int	nic_output __P((int cn));
+static int	nic_output __P((int cn));
 
 static short    bsintr;
 
@@ -183,7 +186,7 @@ typedef struct
 	char           *more_b;
 }               chan_t;
 
-struct nic_softc
+static struct nic_softc
 {
 	dpr_type       *sc_dpr;	/* card RAM virtual memory base */
 	u_short         sc_vector;	/* interrupt vector 		 */
@@ -414,7 +417,7 @@ badstate(mbx_type * mbx, int n, int mb, dpr_type *dpr)
 	printf("\n");
 }
 
-int
+static int
 nic_connect(int cn, int ap, int b_channel, int inf_mask, int out_serv
 	    ,int out_serv_add, int src_subadr, unsigned ad_len
 	    ,char *dest_addr, int spv)
@@ -437,7 +440,7 @@ nic_connect(int cn, int ap, int b_channel, int inf_mask, int out_serv
 	return (en_q_d(&nic_sc[isdn_ctrl[cn].unit], DD_CONN_REQ, MK_APPL(ap), ad_len + 10, buf));
 }
 
-int
+static int
 nic_listen(int cn, int ap, int inf_mask, int subadr_mask, int si_mask, int spv)
 {
 	u_short         sbuf[4];
@@ -448,7 +451,7 @@ nic_listen(int cn, int ap, int inf_mask, int subadr_mask, int si_mask, int spv)
 	return (en_q_d(&nic_sc[isdn_ctrl[cn].unit], DD_LISTEN_REQ, MK_APPL(ap), 8, (u_char *) sbuf));
 }
 
-int
+static int
 nic_disconnect(int cn, int rea)
 {
 	isdn_ctrl_t    *ctrl = &isdn_ctrl[cn];
@@ -486,7 +489,7 @@ nic_disconnect(int cn, int rea)
 	return(err);
 }
 
-int
+static int
 nic_accept(int cn, int an, int rea)
 {
 	isdn_ctrl_t    *ctrl = &isdn_ctrl[cn];
@@ -507,7 +510,7 @@ nic_accept(int cn, int an, int rea)
 	return(sel_b2_prot_req(sc, C_CHAN(cn), chan->plci, &appl->dlpd));
 }
 
-int
+static int
 nic_output(int cn)
 {
 	isdn_ctrl_t    *ctrl = &isdn_ctrl[cn];
diff --git a/sys/gnu/i386/isa/nic3009.c b/sys/gnu/i386/isa/nic3009.c
index e4f4109..75d0440 100644
--- a/sys/gnu/i386/isa/nic3009.c
+++ b/sys/gnu/i386/isa/nic3009.c
@@ -1,6 +1,6 @@
-static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.12 1995/12/08 11:12:47 julian Exp $";
+static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.13 1995/12/08 23:19:30 phk Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.12 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.13 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,9 @@ static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.12 1995/12/08 11:12:47 juli
  *
  *******************************************************************************
  * $Log: nic3009.c,v $
+ * Revision 1.13  1995/12/08  23:19:30  phk
+ * Julian forgot to make the *devsw structures static.
+ *
  * Revision 1.12  1995/12/08  11:12:47  julian
  * Pass 3 of the great devsw changes
  * most devsw referenced functions are now static, as they are
@@ -133,18 +136,18 @@ extern int Isdn_Appl, Isdn_Ctrl, Isdn_Typ;
 
 static old_spy= 0;
 
-extern int	nnicattach __P((struct isa_device *is));
-extern int	nnicprobe __P((struct isa_device *is));
-extern int	nnic_accept __P((int cn, int an, int rea));
-extern int	nnic_connect __P((int cn, int ap, int b_channel, int inf_mask,
+static int	nnicattach __P((struct isa_device *is));
+static int	nnicprobe __P((struct isa_device *is));
+static int	nnic_accept __P((int cn, int an, int rea));
+static int	nnic_connect __P((int cn, int ap, int b_channel, int inf_mask,
 				  int out_serv, int out_serv_add,
 				  int src_subadr, unsigned ad_len,
 				  char *dest_addr, int spv));
-extern int	nnic_disconnect __P((int cn, int rea));
-extern int	nnic_listen __P((int cn, int ap, int inf_mask,
+static int	nnic_disconnect __P((int cn, int rea));
+static int	nnic_listen __P((int cn, int ap, int inf_mask,
 				 int subadr_mask, int si_mask, int spv));
-extern int	nnic_output __P((int cn));
-extern int	nnic_state __P((int cn));
+static int	nnic_output __P((int cn));
+static int	nnic_state __P((int cn));
 
 static	d_open_t	nnicopen;
 static	d_close_t	nnicclose;
@@ -181,7 +184,7 @@ typedef struct
 	char           *more_b;
 }               chan_t;
 
-struct nnic_softc
+static struct nnic_softc
 {
 	dpr_type       *sc_dpr;	/* card RAM virtual memory base */
 	u_short         sc_vector;	/* interrupt vector 		 */
@@ -213,7 +216,7 @@ static int	sel_b3_prot_req __P((int unit, int mb, u_short pl,
 				     ncpd_t *ncpd));
 static void	up_intr __P((unsigned unit, struct nnic_softc *sc));
 
-int
+static int
 nnicprobe(struct isa_device * is)
 {
 	register struct nnic_softc *sc = &nnic_sc[is->id_unit & 127];
@@ -262,7 +265,7 @@ nnic_reset(struct nnic_softc *sc, int reset)
 /*
  * nnicattach() Install device
  */
-int
+static int
 nnicattach(struct isa_device * is)
 {
 	struct nnic_softc *sc;
@@ -364,7 +367,7 @@ badstate(mbx_type * mbx, int n, int mb, dpr_type *dpr)
 	printf("\n");
 }
 
-int
+static int
 nnic_state(int cn)
 {
 	isdn_ctrl_t    *ctrl = &isdn_ctrl[cn];
@@ -384,7 +387,7 @@ nnic_state(int cn)
 	return(0);
 }
 
-int
+static int
 nnic_output(int cn)
 {
 	isdn_ctrl_t    *ctrl = &isdn_ctrl[cn];
@@ -504,7 +507,7 @@ con_b3_resp(int unit, int mb, u_short ncci, u_short pl, u_char reject)
 	return(en_q(unit, mb | BD_CONN_B3_RSP,0, pl, l, buf));
 }
 
-int
+static int
 nnic_connect(int cn, int ap, int b_channel, int inf_mask, int out_serv
 	    ,int out_serv_add, int src_subadr, unsigned ad_len
 	    ,char *dest_addr, int spv)
@@ -527,7 +530,7 @@ nnic_connect(int cn, int ap, int b_channel, int inf_mask, int out_serv
 	return (en_q(isdn_ctrl[cn].unit, DD_CONN_REQ, 0, MK_APPL(ap), ad_len + 10, buf));
 }
 
-int
+static int
 nnic_listen(int cn, int ap, int inf_mask, int subadr_mask, int si_mask, int spv)
 {
 	u_short         sbuf[4];
@@ -540,7 +543,7 @@ nnic_listen(int cn, int ap, int inf_mask, int subadr_mask, int si_mask, int spv)
 	return (en_q(isdn_ctrl[cn].unit, DD_LISTEN_REQ, 0, MK_APPL(ap), 8, (u_char *) sbuf));
 }
 
-int
+static int
 nnic_disconnect(int cn, int rea)
 {
 	isdn_ctrl_t    *ctrl = &isdn_ctrl[cn];
@@ -568,7 +571,7 @@ nnic_disconnect(int cn, int rea)
 	return(err);
 }
 
-int
+static int
 nnic_accept(int cn, int an, int rea)
 {
 	isdn_ctrl_t    *ctrl = &isdn_ctrl[cn];