Remove __P.

9 files changed, 89 insertions, 91 deletions

diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h
index 6083de6..f491a43 100644
--- a/sys/fs/msdosfs/denode.h
+++ b/sys/fs/msdosfs/denode.h
@@ -260,26 +260,26 @@ struct defid {
 
 extern vop_t **msdosfs_vnodeop_p;
 
-int msdosfs_lookup __P((struct vop_cachedlookup_args *));
-int msdosfs_inactive __P((struct vop_inactive_args *));
-int msdosfs_reclaim __P((struct vop_reclaim_args *));
+int msdosfs_lookup(struct vop_cachedlookup_args *);
+int msdosfs_inactive(struct vop_inactive_args *);
+int msdosfs_reclaim(struct vop_reclaim_args *);
 
 /*
  * Internal service routine prototypes.
  */
-int deget __P((struct msdosfsmount *, u_long, u_long, struct denode **));
-int uniqdosname __P((struct denode *, struct componentname *, u_char *));
-int findwin95 __P((struct denode *));
+int deget(struct msdosfsmount *, u_long, u_long, struct denode **);
+int uniqdosname(struct denode *, struct componentname *, u_char *);
+int findwin95(struct denode *);
 
-int readep __P((struct msdosfsmount *pmp, u_long dirclu, u_long dirofs,  struct buf **bpp, struct direntry **epp));
-int readde __P((struct denode *dep, struct buf **bpp, struct direntry **epp));
-int deextend __P((struct denode *dep, u_long length, struct ucred *cred));
-int fillinusemap __P((struct msdosfsmount *pmp));
-void reinsert __P((struct denode *dep));
-int dosdirempty __P((struct denode *dep));
-int createde __P((struct denode *dep, struct denode *ddep, struct denode **depp, struct componentname *cnp));
-int deupdat __P((struct denode *dep, int waitfor));
-int removede __P((struct denode *pdep, struct denode *dep));
-int detrunc __P((struct denode *dep, u_long length, int flags, struct ucred *cred, struct thread *td));
-int doscheckpath __P(( struct denode *source, struct denode *target));
+int readep(struct msdosfsmount *pmp, u_long dirclu, u_long dirofs,  struct buf **bpp, struct direntry **epp);
+int readde(struct denode *dep, struct buf **bpp, struct direntry **epp);
+int deextend(struct denode *dep, u_long length, struct ucred *cred);
+int fillinusemap(struct msdosfsmount *pmp);
+void reinsert(struct denode *dep);
+int dosdirempty(struct denode *dep);
+int createde(struct denode *dep, struct denode *ddep, struct denode **depp, struct componentname *cnp);
+int deupdat(struct denode *dep, int waitfor);
+int removede(struct denode *pdep, struct denode *dep);
+int detrunc(struct denode *dep, u_long length, int flags, struct ucred *cred, struct thread *td);
+int doscheckpath( struct denode *source, struct denode *target);
 #endif	/* _KERNEL */
diff --git a/sys/fs/msdosfs/direntry.h b/sys/fs/msdosfs/direntry.h
index fccf58b..8ed5335 100644
--- a/sys/fs/msdosfs/direntry.h
+++ b/sys/fs/msdosfs/direntry.h
@@ -129,15 +129,15 @@ struct winentry {
 
 #ifdef _KERNEL
 struct dirent;
-void unix2dostime __P((struct timespec *tsp, u_int16_t *ddp, 
-	     u_int16_t *dtp, u_int8_t *dhp));
-void dos2unixtime __P((u_int dd, u_int dt, u_int dh, struct timespec *tsp));
-int dos2unixfn __P((u_char dn[11], u_char *un, int lower, int d2u_loaded, u_int8_t *d2u, int ul_loaded, u_int8_t *ul));
-int unix2dosfn __P((const u_char *un, u_char dn[12], int unlen, u_int gen, int u2d_loaded, u_int8_t *u2d, int lu_loaded, u_int8_t *lu));
-int unix2winfn __P((const u_char *un, int unlen, struct winentry *wep, int cnt, int chksum, int table_loaded, u_int16_t *u2w));
-int winChkName __P((const u_char *un, int unlen, struct winentry *wep, int chksum, int u2w_loaded, u_int16_t *u2w, int ul_loaded, u_int8_t *ul));
-int win2unixfn __P((struct winentry *wep, struct dirent *dp, int chksum, int table_loaded, u_int16_t *u2w));
-u_int8_t winChksum __P((u_int8_t *name));
-int winSlotCnt __P((const u_char *un, int unlen));
-int winLenFixup __P((const u_char *un, int unlen));
+void unix2dostime(struct timespec *tsp, u_int16_t *ddp, 
+	     u_int16_t *dtp, u_int8_t *dhp);
+void dos2unixtime(u_int dd, u_int dt, u_int dh, struct timespec *tsp);
+int dos2unixfn(u_char dn[11], u_char *un, int lower, int d2u_loaded, u_int8_t *d2u, int ul_loaded, u_int8_t *ul);
+int unix2dosfn(const u_char *un, u_char dn[12], int unlen, u_int gen, int u2d_loaded, u_int8_t *u2d, int lu_loaded, u_int8_t *lu);
+int unix2winfn(const u_char *un, int unlen, struct winentry *wep, int cnt, int chksum, int table_loaded, u_int16_t *u2w);
+int winChkName(const u_char *un, int unlen, struct winentry *wep, int chksum, int u2w_loaded, u_int16_t *u2w, int ul_loaded, u_int8_t *ul);
+int win2unixfn(struct winentry *wep, struct dirent *dp, int chksum, int table_loaded, u_int16_t *u2w);
+u_int8_t winChksum(u_int8_t *name);
+int winSlotCnt(const u_char *un, int unlen);
+int winLenFixup(const u_char *un, int unlen);
 #endif	/* _KERNEL */
diff --git a/sys/fs/msdosfs/fat.h b/sys/fs/msdosfs/fat.h
index 9a10c68..216fde5 100644
--- a/sys/fs/msdosfs/fat.h
+++ b/sys/fs/msdosfs/fat.h
@@ -92,12 +92,12 @@
  */
 #define	DE_CLEAR	1	/* Zero out the blocks allocated */
 
-int pcbmap __P((struct denode *dep, u_long findcn, daddr_t *bnp, u_long *cnp, int* sp));
-int clusterfree __P((struct msdosfsmount *pmp, u_long cn, u_long *oldcnp));
-int clusteralloc __P((struct msdosfsmount *pmp, u_long start, u_long count, u_long fillwith, u_long *retcluster, u_long *got));
-int fatentry __P((int function, struct msdosfsmount *pmp, u_long cluster, u_long *oldcontents, u_long newcontents));
-int freeclusterchain __P((struct msdosfsmount *pmp, u_long startchain));
-int extendfile __P((struct denode *dep, u_long count, struct buf **bpp, u_long *ncp, int flags));
-void fc_purge __P((struct denode *dep, u_int frcn));
+int pcbmap(struct denode *dep, u_long findcn, daddr_t *bnp, u_long *cnp, int* sp);
+int clusterfree(struct msdosfsmount *pmp, u_long cn, u_long *oldcnp);
+int clusteralloc(struct msdosfsmount *pmp, u_long start, u_long count, u_long fillwith, u_long *retcluster, u_long *got);
+int fatentry(int function, struct msdosfsmount *pmp, u_long cluster, u_long *oldcontents, u_long newcontents);
+int freeclusterchain(struct msdosfsmount *pmp, u_long startchain);
+int extendfile(struct denode *dep, u_long count, struct buf **bpp, u_long *ncp, int flags);
+void fc_purge(struct denode *dep, u_int frcn);
 
 #endif	/* _KERNEL */
diff --git a/sys/fs/msdosfs/msdosfs_conv.c b/sys/fs/msdosfs/msdosfs_conv.c
index 1cfe6a4..32138c5 100644
--- a/sys/fs/msdosfs/msdosfs_conv.c
+++ b/sys/fs/msdosfs/msdosfs_conv.c
@@ -88,7 +88,7 @@ static u_long  lastday;
 static u_short lastddate;
 static u_short lastdtime;
 
-static __inline u_int8_t find_lcode __P((u_int16_t code, u_int16_t *u2w));
+static __inline u_int8_t find_lcode(u_int16_t code, u_int16_t *u2w);
 
 /*
  * Convert the unix version of time to dos's idea of time to be used in
diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c
index 9538ba3..3a24b7c 100644
--- a/sys/fs/msdosfs/msdosfs_denode.c
+++ b/sys/fs/msdosfs/msdosfs_denode.c
@@ -93,10 +93,9 @@ union _qcvt {
 }
 
 static struct denode *
-		msdosfs_hashget __P((dev_t dev, u_long dirclust,
-				     u_long diroff));
-static void	msdosfs_hashins __P((struct denode *dep));
-static void	msdosfs_hashrem __P((struct denode *dep));
+		msdosfs_hashget(dev_t dev, u_long dirclust, u_long diroff);
+static void	msdosfs_hashins(struct denode *dep);
+static void	msdosfs_hashrem(struct denode *dep);
 
 /*ARGSUSED*/
 int 
diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c
index 7c4f6c9..a71ec73 100644
--- a/sys/fs/msdosfs/msdosfs_fat.c
+++ b/sys/fs/msdosfs/msdosfs_fat.c
@@ -80,23 +80,23 @@ static int fc_lmdistance[LMMAX];/* counters for how far off the last
 				 * cluster mapped entry was. */
 static int fc_largedistance;	/* off by more than LMMAX		 */
 
-static int	chainalloc __P((struct msdosfsmount *pmp, u_long start,
+static int	chainalloc(struct msdosfsmount *pmp, u_long start,
 				u_long count, u_long fillwith,
-				u_long *retcluster, u_long *got));
-static int	chainlength __P((struct msdosfsmount *pmp, u_long start,
-				 u_long count));
-static void	fatblock __P((struct msdosfsmount *pmp, u_long ofs,
-			      u_long *bnp, u_long *sizep, u_long *bop));
-static int	fatchain __P((struct msdosfsmount *pmp, u_long start,
-			      u_long count, u_long fillwith));
-static void	fc_lookup __P((struct denode *dep, u_long findcn,
-			       u_long *frcnp, u_long *fsrcnp));
-static void	updatefats __P((struct msdosfsmount *pmp, struct buf *bp,
-				u_long fatbn));
+				u_long *retcluster, u_long *got);
+static int	chainlength(struct msdosfsmount *pmp, u_long start,
+				 u_long count);
+static void	fatblock(struct msdosfsmount *pmp, u_long ofs,
+			      u_long *bnp, u_long *sizep, u_long *bop);
+static int	fatchain(struct msdosfsmount *pmp, u_long start,
+			      u_long count, u_long fillwith);
+static void	fc_lookup(struct denode *dep, u_long findcn,
+			       u_long *frcnp, u_long *fsrcnp);
+static void	updatefats(struct msdosfsmount *pmp, struct buf *bp,
+				u_long fatbn);
 static __inline void
-		usemap_alloc __P((struct msdosfsmount *pmp, u_long cn));
+		usemap_alloc(struct msdosfsmount *pmp, u_long cn);
 static __inline void
-		usemap_free __P((struct msdosfsmount *pmp, u_long cn));
+		usemap_free(struct msdosfsmount *pmp, u_long cn);
 
 static void
 fatblock(pmp, ofs, bnp, sizep, bop)
diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c
index 622d7d0..88cc67c 100644
--- a/sys/fs/msdosfs/msdosfs_vfsops.c
+++ b/sys/fs/msdosfs/msdosfs_vfsops.c
@@ -86,20 +86,19 @@
 MALLOC_DEFINE(M_MSDOSFSMNT, "MSDOSFS mount", "MSDOSFS mount structure");
 static MALLOC_DEFINE(M_MSDOSFSFAT, "MSDOSFS FAT", "MSDOSFS file allocation table");
 
-static int	update_mp __P((struct mount *mp, struct msdosfs_args *argp));
-static int	mountmsdosfs __P((struct vnode *devvp, struct mount *mp,
-				  struct thread *td, struct msdosfs_args *argp));
-static int	msdosfs_fhtovp __P((struct mount *, struct fid *,
-				    struct vnode **));
-static int	msdosfs_mount __P((struct mount *, char *, caddr_t,
-				   struct nameidata *, struct thread *));
-static int	msdosfs_root __P((struct mount *, struct vnode **));
-static int	msdosfs_statfs __P((struct mount *, struct statfs *,
-				    struct thread *));
-static int	msdosfs_sync __P((struct mount *, int, struct ucred *,
-				  struct thread *));
-static int	msdosfs_unmount __P((struct mount *, int, struct thread *));
-static int	msdosfs_vptofh __P((struct vnode *, struct fid *));
+static int	update_mp(struct mount *mp, struct msdosfs_args *argp);
+static int	mountmsdosfs(struct vnode *devvp, struct mount *mp,
+				  struct thread *td, struct msdosfs_args *argp);
+static int	msdosfs_fhtovp(struct mount *, struct fid *, struct vnode **);
+static int	msdosfs_mount(struct mount *, char *, caddr_t,
+				   struct nameidata *, struct thread *);
+static int	msdosfs_root(struct mount *, struct vnode **);
+static int	msdosfs_statfs(struct mount *, struct statfs *,
+				    struct thread *);
+static int	msdosfs_sync(struct mount *, int, struct ucred *,
+				  struct thread *);
+static int	msdosfs_unmount(struct mount *, int, struct thread *);
+static int	msdosfs_vptofh(struct vnode *, struct fid *);
 
 static int
 update_mp(mp, argp)
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 51e541f..5118409 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -81,26 +81,26 @@
 /*
  * Prototypes for MSDOSFS vnode operations
  */
-static int msdosfs_create __P((struct vop_create_args *));
-static int msdosfs_mknod __P((struct vop_mknod_args *));
-static int msdosfs_close __P((struct vop_close_args *));
-static int msdosfs_access __P((struct vop_access_args *));
-static int msdosfs_getattr __P((struct vop_getattr_args *));
-static int msdosfs_setattr __P((struct vop_setattr_args *));
-static int msdosfs_read __P((struct vop_read_args *));
-static int msdosfs_write __P((struct vop_write_args *));
-static int msdosfs_fsync __P((struct vop_fsync_args *));
-static int msdosfs_remove __P((struct vop_remove_args *));
-static int msdosfs_link __P((struct vop_link_args *));
-static int msdosfs_rename __P((struct vop_rename_args *));
-static int msdosfs_mkdir __P((struct vop_mkdir_args *));
-static int msdosfs_rmdir __P((struct vop_rmdir_args *));
-static int msdosfs_symlink __P((struct vop_symlink_args *));
-static int msdosfs_readdir __P((struct vop_readdir_args *));
-static int msdosfs_bmap __P((struct vop_bmap_args *));
-static int msdosfs_strategy __P((struct vop_strategy_args *));
-static int msdosfs_print __P((struct vop_print_args *));
-static int msdosfs_pathconf __P((struct vop_pathconf_args *ap));
+static int msdosfs_create(struct vop_create_args *);
+static int msdosfs_mknod(struct vop_mknod_args *);
+static int msdosfs_close(struct vop_close_args *);
+static int msdosfs_access(struct vop_access_args *);
+static int msdosfs_getattr(struct vop_getattr_args *);
+static int msdosfs_setattr(struct vop_setattr_args *);
+static int msdosfs_read(struct vop_read_args *);
+static int msdosfs_write(struct vop_write_args *);
+static int msdosfs_fsync(struct vop_fsync_args *);
+static int msdosfs_remove(struct vop_remove_args *);
+static int msdosfs_link(struct vop_link_args *);
+static int msdosfs_rename(struct vop_rename_args *);
+static int msdosfs_mkdir(struct vop_mkdir_args *);
+static int msdosfs_rmdir(struct vop_rmdir_args *);
+static int msdosfs_symlink(struct vop_symlink_args *);
+static int msdosfs_readdir(struct vop_readdir_args *);
+static int msdosfs_bmap(struct vop_bmap_args *);
+static int msdosfs_strategy(struct vop_strategy_args *);
+static int msdosfs_print(struct vop_print_args *);
+static int msdosfs_pathconf(struct vop_pathconf_args *ap);
 
 /*
  * Some general notes:
diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h
index 1b98219..8099dee 100644
--- a/sys/fs/msdosfs/msdosfsmount.h
+++ b/sys/fs/msdosfs/msdosfsmount.h
@@ -196,9 +196,9 @@ struct msdosfsmount {
 #define	fsi_size(pmp) \
 	(1024 << ((pmp)->pm_BlkPerSec >> 2))
 
-int msdosfs_init __P((struct vfsconf *vfsp));
-int msdosfs_uninit __P((struct vfsconf *vfsp));
-int msdosfs_mountroot __P((void));
+int msdosfs_init(struct vfsconf *vfsp);
+int msdosfs_uninit(struct vfsconf *vfsp);
+int msdosfs_mountroot(void);
 
 #endif /* _KERNEL */