First round of __P removal in sys

4 files changed, 57 insertions, 57 deletions

diff --git a/sys/adosfs/adosfs.h b/sys/adosfs/adosfs.h
index 5c0b9e3c893..303e68c7867 100644
--- a/sys/adosfs/adosfs.h
+++ b/sys/adosfs/adosfs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adosfs.h,v 1.10 2001/12/19 08:58:05 art Exp $	*/
+/*	$OpenBSD: adosfs.h,v 1.11 2002/03/14 01:26:25 millert Exp $	*/
 /*	$NetBSD: adosfs.h,v 1.12 1996/10/08 22:18:02 thorpej Exp $	*/
 
 /*
@@ -137,16 +137,16 @@ struct adosfsmount {
  */
 #define adoswordn(bp,wn) betoh32(*((u_int32_t *)(bp)->b_data + (wn)))
 
-u_int32_t	 adoscksum __P((struct buf *, int));
-int		 adoscaseequ __P((const char *, const char *, int, int));
-int		 adoshash __P((const char *, int, int, int));
-int		 adunixprot __P((int));
-int		 adosfs_getblktype __P((struct adosfsmount *, struct buf *));
+u_int32_t	 adoscksum(struct buf *, int);
+int		 adoscaseequ(const char *, const char *, int, int);
+int		 adoshash(const char *, int, int, int);
+int		 adunixprot(int);
+int		 adosfs_getblktype(struct adosfsmount *, struct buf *);
 
-struct vnode	*adosfs_ahashget __P((struct mount *, ino_t));
-int		 adosfs_ainshash __P((struct adosfsmount *, struct anode *));
-void		 adosfs_aremhash __P((struct anode *));
+struct vnode	*adosfs_ahashget(struct mount *, ino_t);
+int		 adosfs_ainshash(struct adosfsmount *, struct anode *);
+void		 adosfs_aremhash(struct anode *);
 
-int		 adosfs_lookup __P((void *));
+int		 adosfs_lookup(void *);
 
-int		(**adosfs_vnodeop_p) __P((void *));
+int		(**adosfs_vnodeop_p)(void *);
diff --git a/sys/adosfs/adutil.c b/sys/adosfs/adutil.c
index 6ef8b88f124..bda25fd9bd3 100644
--- a/sys/adosfs/adutil.c
+++ b/sys/adosfs/adutil.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adutil.c,v 1.12 1998/09/03 15:50:32 csapuntz Exp $	*/
+/*	$OpenBSD: adutil.c,v 1.13 2002/03/14 01:26:25 millert Exp $	*/
 /*	$NetBSD: adutil.c,v 1.15 1996/10/13 02:52:07 christos Exp $	*/
 
 /*
@@ -51,7 +51,7 @@
  */
 #define AHASH(an) ((an) & (ANODEHASHSZ - 1))
 
-static __inline char	CapitalChar __P((char, int));
+static __inline char	CapitalChar(char, int);
 
 struct vnode * 
 adosfs_ahashget(mp, an)
diff --git a/sys/adosfs/advfsops.c b/sys/adosfs/advfsops.c
index 43a673042b5..3793672b307 100644
--- a/sys/adosfs/advfsops.c
+++ b/sys/adosfs/advfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: advfsops.c,v 1.21 2001/12/19 08:58:05 art Exp $	*/
+/*	$OpenBSD: advfsops.c,v 1.22 2002/03/14 01:26:25 millert Exp $	*/
 /*	$NetBSD: advfsops.c,v 1.24 1996/12/22 10:10:12 cgd Exp $	*/
 
 /*
@@ -50,23 +50,23 @@
 #include <miscfs/specfs/specdev.h> /* XXX */
 #include <adosfs/adosfs.h>
 
-int	 adosfs_init __P((struct vfsconf *));
-int	 adosfs_mount __P((struct mount *, const char *, void *, struct nameidata *,
-    struct proc *));
-int	 adosfs_start __P((struct mount *, int, struct proc *));
-int	 adosfs_unmount __P((struct mount *, int, struct proc *));
-int	 adosfs_root __P((struct mount *, struct vnode **));
-int	 adosfs_quotactl __P((struct mount *, int, uid_t, caddr_t,
-    struct proc *));
-int	 adosfs_statfs __P((struct mount *, struct statfs *, struct proc *));
-int	 adosfs_sync __P((struct mount *, int, struct ucred *, struct proc *));
-int	 adosfs_vget __P((struct mount *, ino_t, struct vnode **));
-int	 adosfs_fhtovp __P((struct mount *, struct fid *, struct vnode **));
-
-int	 adosfs_vptofh __P((struct vnode *, struct fid *));
-
-int	 adosfs_mountfs __P((struct vnode *, struct mount *, struct proc *));
-int	 adosfs_loadbitmap __P((struct adosfsmount *));
+int	 adosfs_init(struct vfsconf *);
+int	 adosfs_mount(struct mount *, const char *, void *, struct nameidata *,
+    struct proc *);
+int	 adosfs_start(struct mount *, int, struct proc *);
+int	 adosfs_unmount(struct mount *, int, struct proc *);
+int	 adosfs_root(struct mount *, struct vnode **);
+int	 adosfs_quotactl(struct mount *, int, uid_t, caddr_t,
+    struct proc *);
+int	 adosfs_statfs(struct mount *, struct statfs *, struct proc *);
+int	 adosfs_sync(struct mount *, int, struct ucred *, struct proc *);
+int	 adosfs_vget(struct mount *, ino_t, struct vnode **);
+int	 adosfs_fhtovp(struct mount *, struct fid *, struct vnode **);
+
+int	 adosfs_vptofh(struct vnode *, struct fid *);
+
+int	 adosfs_mountfs(struct vnode *, struct mount *, struct proc *);
+int	 adosfs_loadbitmap(struct adosfsmount *);
 
 int
 adosfs_mount(mp, path, data, ndp, p)
diff --git a/sys/adosfs/advnops.c b/sys/adosfs/advnops.c
index 27f806f3bce..a933ad30715 100644
--- a/sys/adosfs/advnops.c
+++ b/sys/adosfs/advnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: advnops.c,v 1.22 2001/12/19 08:58:05 art Exp $	*/
+/*	$OpenBSD: advnops.c,v 1.23 2002/03/14 01:26:25 millert Exp $	*/
 /*	$NetBSD: advnops.c,v 1.32 1996/10/13 02:52:09 christos Exp $	*/
 
 /*
@@ -53,34 +53,34 @@
 
 extern struct vnodeops adosfs_vnodeops;
 
-int	adosfs_advlock	__P((void *));
-int	adosfs_open	__P((void *));
-int	adosfs_getattr	__P((void *));
-int	adosfs_read	__P((void *));
-int	adosfs_write	__P((void *));
-int	adosfs_ioctl	__P((void *));
-int	adosfs_select	__P((void *));
-int	adosfs_strategy	__P((void *));
-int	adosfs_link	__P((void *));
-int	adosfs_symlink	__P((void *));
-int	adosfs_lock	__P((void *));
-int	adosfs_unlock	__P((void *));
-int	adosfs_bmap	__P((void *));
-int	adosfs_print	__P((void *));
-int	adosfs_readdir	__P((void *));
-int	adosfs_access	__P((void *));
-int	adosfs_readlink	__P((void *));
-int	adosfs_inactive	__P((void *));
-int	adosfs_islocked	__P((void *));
-int	adosfs_reclaim	__P((void *));
-int	adosfs_pathconf	__P((void *));
-int	adnullop	__P((void *));
-int	adenotsup	__P((void *));
+int	adosfs_advlock(void *);
+int	adosfs_open(void *);
+int	adosfs_getattr(void *);
+int	adosfs_read(void *);
+int	adosfs_write(void *);
+int	adosfs_ioctl(void *);
+int	adosfs_select(void *);
+int	adosfs_strategy(void *);
+int	adosfs_link(void *);
+int	adosfs_symlink(void *);
+int	adosfs_lock(void *);
+int	adosfs_unlock(void *);
+int	adosfs_bmap(void *);
+int	adosfs_print(void *);
+int	adosfs_readdir(void *);
+int	adosfs_access(void *);
+int	adosfs_readlink(void *);
+int	adosfs_inactive(void *);
+int	adosfs_islocked(void *);
+int	adosfs_reclaim(void *);
+int	adosfs_pathconf(void *);
+int	adnullop(void *);
+int	adenotsup(void *);
 
 #define adosfs_close 		adnullop
 #define adosfs_fsync 		adnullop
 #ifdef NFSSERVER
-int	lease_check __P((void *));
+int	lease_check(void *);
 #define	adosfs_lease_check lease_check
 #else
 #define adosfs_lease_check 	adnullop
@@ -131,7 +131,7 @@ struct vnodeopv_entry_desc adosfs_vnodeop_entries[] = {
 	{ &vop_pathconf_desc, adosfs_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, adosfs_advlock },		/* advlock */
 	{ &vop_bwrite_desc, adosfs_bwrite },		/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
+	{ (struct vnodeop_desc*)NULL, (int(*)(void *))NULL }
 };
 
 struct vnodeopv_desc adosfs_vnodeop_opv_desc =