First round of __P removal in sys

7 files changed, 113 insertions, 113 deletions

diff --git a/sys/ufs/lfs/lfs_alloc.c b/sys/ufs/lfs/lfs_alloc.c
index 3eea47462fa..9289ece8cda 100644
--- a/sys/ufs/lfs/lfs_alloc.c
+++ b/sys/ufs/lfs/lfs_alloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lfs_alloc.c,v 1.8 2001/11/06 19:53:21 miod Exp $	*/
+/*	$OpenBSD: lfs_alloc.c,v 1.9 2002/03/14 01:27:15 millert Exp $	*/
 /*	$NetBSD: lfs_alloc.c,v 1.4 1996/03/25 12:53:37 pk Exp $	*/
 
 /*
@@ -164,7 +164,7 @@ lfs_vcreate(mp, ino, vpp)
 	ino_t ino;
 	struct vnode **vpp;
 {
-	extern int (**lfs_vnodeop_p) __P((void *));
+	extern int (**lfs_vnodeop_p)(void *);
 	struct inode *ip;
 	struct ufsmount *ump;
 	int error;
diff --git a/sys/ufs/lfs/lfs_balloc.c b/sys/ufs/lfs/lfs_balloc.c
index 490aa1da0c2..643ce2160e1 100644
--- a/sys/ufs/lfs/lfs_balloc.c
+++ b/sys/ufs/lfs/lfs_balloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lfs_balloc.c,v 1.7 2001/11/06 19:53:21 miod Exp $	*/
+/*	$OpenBSD: lfs_balloc.c,v 1.8 2002/03/14 01:27:15 millert Exp $	*/
 /*	$NetBSD: lfs_balloc.c,v 1.3 1996/02/09 22:28:48 christos Exp $	*/
 
 /*
@@ -56,8 +56,8 @@
 
 #include <uvm/uvm_extern.h>
 
-int lfs_fragextend __P((struct vnode *vp, int osize, int nsize, daddr_t lbn,
-	struct buf **bpp));
+int lfs_fragextend(struct vnode *vp, int osize, int nsize, daddr_t lbn,
+	struct buf **bpp);
 
 
 int
diff --git a/sys/ufs/lfs/lfs_extern.h b/sys/ufs/lfs/lfs_extern.h
index d57add72a46..fd042001dbb 100644
--- a/sys/ufs/lfs/lfs_extern.h
+++ b/sys/ufs/lfs/lfs_extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lfs_extern.h,v 1.6 2001/02/20 01:50:12 assar Exp $	*/
+/*	$OpenBSD: lfs_extern.h,v 1.7 2002/03/14 01:27:15 millert Exp $	*/
 /*	$NetBSD: lfs_extern.h,v 1.5 1996/02/12 15:20:12 christos Exp $	*/
 
 /*-
@@ -56,101 +56,101 @@ struct ucred;
 
 __BEGIN_DECLS
 /* lfs_alloc.c */
-int lfs_vcreate __P((struct mount *, ino_t, struct vnode **));
+int lfs_vcreate(struct mount *, ino_t, struct vnode **);
 
 
 /* lfs_balloc.c */
-int lfs_balloc __P((struct vnode *, int, u_long, ufs_daddr_t, struct buf **));
+int lfs_balloc(struct vnode *, int, u_long, ufs_daddr_t, struct buf **);
 
 /* lfs_bio.c */
-void lfs_flush __P((void));
-int lfs_check __P((struct vnode *, ufs_daddr_t));
+void lfs_flush(void);
+int lfs_check(struct vnode *, ufs_daddr_t);
 
 /* lfs_cksum.c */
-u_long cksum __P((void *, size_t));
+u_long cksum(void *, size_t);
 
 /* lfs_debug.c */
 #ifdef DEBUG
-void lfs_dump_super __P((struct lfs *));
-void lfs_dump_dinode __P((struct dinode *));
+void lfs_dump_super(struct lfs *);
+void lfs_dump_dinode(struct dinode *);
 #endif
 
 /* lfs_inode.c */
-void lfs_init __P((void));
-struct dinode *lfs_ifind __P((struct lfs *, ino_t, struct dinode *));
+void lfs_init(void);
+struct dinode *lfs_ifind(struct lfs *, ino_t, struct dinode *);
 
 /* lfs_segment.c */
-int lfs_vflush __P((struct vnode *));
-void lfs_writevnodes __P((struct lfs *, struct mount *, struct segment *, int));
-int lfs_segwrite __P((struct mount *, int));
-void lfs_writefile __P((struct lfs *, struct segment *, struct vnode *));
-int lfs_writeinode __P((struct lfs *, struct segment *, struct inode *));
-int lfs_gatherblock __P((struct segment *, struct buf *, int *));
-void lfs_gather __P((struct lfs *, struct segment *, struct vnode *, int (*match )__P ((struct lfs *, struct buf *))));
-void lfs_updatemeta __P((struct segment *));
-int lfs_initseg __P((struct lfs *));
-void lfs_newseg __P((struct lfs *));
-int lfs_writeseg __P((struct lfs *, struct segment *));
-void lfs_writesuper __P((struct lfs *));
-int lfs_match_data __P((struct lfs *, struct buf *));
-int lfs_match_indir __P((struct lfs *, struct buf *));
-int lfs_match_dindir __P((struct lfs *, struct buf *));
-int lfs_match_tindir __P((struct lfs *, struct buf *));
-struct buf *lfs_newbuf __P((struct vnode *, ufs_daddr_t, size_t));
-void lfs_callback __P((struct buf *));
-void lfs_supercallback __P((struct buf *));
-void lfs_shellsort __P((struct buf **, ufs_daddr_t *, int));
-int lfs_vref __P((struct vnode *));
-void lfs_vunref __P((struct vnode *));
+int lfs_vflush(struct vnode *);
+void lfs_writevnodes(struct lfs *, struct mount *, struct segment *, int);
+int lfs_segwrite(struct mount *, int);
+void lfs_writefile(struct lfs *, struct segment *, struct vnode *);
+int lfs_writeinode(struct lfs *, struct segment *, struct inode *);
+int lfs_gatherblock(struct segment *, struct buf *, int *);
+void lfs_gather __P((struct lfs *, struct segment *, struct vnode *, int (*match )(struct lfs *, struct buf *)));
+void lfs_updatemeta(struct segment *);
+int lfs_initseg(struct lfs *);
+void lfs_newseg(struct lfs *);
+int lfs_writeseg(struct lfs *, struct segment *);
+void lfs_writesuper(struct lfs *);
+int lfs_match_data(struct lfs *, struct buf *);
+int lfs_match_indir(struct lfs *, struct buf *);
+int lfs_match_dindir(struct lfs *, struct buf *);
+int lfs_match_tindir(struct lfs *, struct buf *);
+struct buf *lfs_newbuf(struct vnode *, ufs_daddr_t, size_t);
+void lfs_callback(struct buf *);
+void lfs_supercallback(struct buf *);
+void lfs_shellsort(struct buf **, ufs_daddr_t *, int);
+int lfs_vref(struct vnode *);
+void lfs_vunref(struct vnode *);
 
 /* lfs_subr.c */
-void lfs_seglock __P((struct lfs *, unsigned long));
-void lfs_segunlock __P((struct lfs *));
+void lfs_seglock(struct lfs *, unsigned long);
+void lfs_segunlock(struct lfs *);
 
 /* lfs_syscalls.c */
-int lfs_fastvget __P((struct mount *, ino_t, ufs_daddr_t, struct vnode **, struct dinode *));
-struct buf *lfs_fakebuf __P((struct vnode *, int, size_t, caddr_t));
+int lfs_fastvget(struct mount *, ino_t, ufs_daddr_t, struct vnode **, struct dinode *);
+struct buf *lfs_fakebuf(struct vnode *, int, size_t, caddr_t);
 
 /* lfs_vfsops.c */
-int lfs_mountroot __P((void));
-int lfs_mount __P((struct mount *, const char *, void *, struct nameidata *, struct proc *));
-int lfs_mountfs __P((struct vnode *, struct mount *, struct proc *));
-int lfs_unmount __P((struct mount *, int, struct proc *));
-int lfs_statfs __P((struct mount *, struct statfs *, struct proc *));
-int lfs_sync __P((struct mount *, int, struct ucred *, struct proc *));
-int lfs_vget __P((struct mount *, ino_t, struct vnode **));
-int lfs_fhtovp __P((struct mount *, struct fid *, struct vnode **));
-int lfs_vptofh __P((struct vnode *, struct fid *));
-int lfs_sysctl __P((int *, u_int, void *, size_t *, void *, size_t,
-		    struct proc *));
-
-int lfs_valloc		__P((void *));
-int lfs_vfree		__P((void *));
-int lfs_bwrite		__P((void *));
-int lfs_update		__P((void *));
-int lfs_truncate	__P((void *));
-int lfs_blkatoff	__P((void *));
-int lfs_fsync		__P((void *));
-int lfs_symlink		__P((void *));
-int lfs_mknod		__P((void *));
-int lfs_create		__P((void *));
-int lfs_mkdir		__P((void *));
-int lfs_read		__P((void *));
-int lfs_remove		__P((void *));
-int lfs_rmdir		__P((void *));
-int lfs_link		__P((void *));
-int lfs_rename		__P((void *));
-int lfs_getattr		__P((void *));
-int lfs_close		__P((void *));
-int lfs_inactive	__P((void *));
-int lfs_reclaim		__P((void *));
-int lfs_write		__P((void *));
+int lfs_mountroot(void);
+int lfs_mount(struct mount *, const char *, void *, struct nameidata *, struct proc *);
+int lfs_mountfs(struct vnode *, struct mount *, struct proc *);
+int lfs_unmount(struct mount *, int, struct proc *);
+int lfs_statfs(struct mount *, struct statfs *, struct proc *);
+int lfs_sync(struct mount *, int, struct ucred *, struct proc *);
+int lfs_vget(struct mount *, ino_t, struct vnode **);
+int lfs_fhtovp(struct mount *, struct fid *, struct vnode **);
+int lfs_vptofh(struct vnode *, struct fid *);
+int lfs_sysctl(int *, u_int, void *, size_t *, void *, size_t,
+		    struct proc *);
+
+int lfs_valloc(void *);
+int lfs_vfree(void *);
+int lfs_bwrite(void *);
+int lfs_update(void *);
+int lfs_truncate(void *);
+int lfs_blkatoff(void *);
+int lfs_fsync(void *);
+int lfs_symlink(void *);
+int lfs_mknod(void *);
+int lfs_create(void *);
+int lfs_mkdir(void *);
+int lfs_read(void *);
+int lfs_remove(void *);
+int lfs_rmdir(void *);
+int lfs_link(void *);
+int lfs_rename(void *);
+int lfs_getattr(void *);
+int lfs_close(void *);
+int lfs_inactive(void *);
+int lfs_reclaim(void *);
+int lfs_write(void *);
 
 __END_DECLS
-extern int (**lfs_vnodeop_p) __P((void *));
-extern int (**lfs_specop_p) __P((void *));
+extern int (**lfs_vnodeop_p)(void *);
+extern int (**lfs_specop_p)(void *);
 #ifdef FIFO
-extern int (**lfs_fifoop_p) __P((void *));
+extern int (**lfs_fifoop_p)(void *);
 #define LFS_FIFOOPS lfs_fifoop_p
 #else
 #define LFS_FIFOOPS NULL
diff --git a/sys/ufs/lfs/lfs_segment.c b/sys/ufs/lfs/lfs_segment.c
index 5ac2a62cd81..3b53e35c5f9 100644
--- a/sys/ufs/lfs/lfs_segment.c
+++ b/sys/ufs/lfs/lfs_segment.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lfs_segment.c,v 1.9 2001/02/23 14:52:52 csapuntz Exp $	*/
+/*	$OpenBSD: lfs_segment.c,v 1.10 2002/03/14 01:27:15 millert Exp $	*/
 /*	$NetBSD: lfs_segment.c,v 1.4 1996/02/09 22:28:54 christos Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
 #include <ufs/lfs/lfs.h>
 #include <ufs/lfs/lfs_extern.h>
 
-extern int count_lock_queue __P((void));
+extern int count_lock_queue(void);
 
 #define MAX_ACTIVE	10
 /*
@@ -73,27 +73,27 @@ extern int count_lock_queue __P((void));
 	((fs)->lfs_dbpseg - ((fs)->lfs_offset - (fs)->lfs_curseg) > \
 	1 << (fs)->lfs_fsbtodb)
 
-void	 lfs_callback __P((struct buf *));
+void	 lfs_callback(struct buf *);
 void	 lfs_gather __P((struct lfs *, struct segment *,
-	     struct vnode *, int (*) __P((struct lfs *, struct buf *))));
-int	 lfs_gatherblock __P((struct segment *, struct buf *, int *));
-void	 lfs_iset __P((struct inode *, ufs_daddr_t, time_t));
-int	 lfs_match_data __P((struct lfs *, struct buf *));
-int	 lfs_match_dindir __P((struct lfs *, struct buf *));
-int	 lfs_match_indir __P((struct lfs *, struct buf *));
-int	 lfs_match_tindir __P((struct lfs *, struct buf *));
-void	 lfs_newseg __P((struct lfs *));
-void	 lfs_shellsort __P((struct buf **, ufs_daddr_t *, register int));
-void	 lfs_supercallback __P((struct buf *));
-void	 lfs_updatemeta __P((struct segment *));
-int	 lfs_vref __P((struct vnode *));
-void	 lfs_vunref __P((struct vnode *));
-void	 lfs_writefile __P((struct lfs *, struct segment *, struct vnode *));
-int	 lfs_writeinode __P((struct lfs *, struct segment *, struct inode *));
-int	 lfs_writeseg __P((struct lfs *, struct segment *));
-void	 lfs_writesuper __P((struct lfs *));
-void	 lfs_writevnodes __P((struct lfs *fs, struct mount *mp,
-	    struct segment *sp, int dirops));
+	     struct vnode *, int (*)(struct lfs *, struct buf *)));
+int	 lfs_gatherblock(struct segment *, struct buf *, int *);
+void	 lfs_iset(struct inode *, ufs_daddr_t, time_t);
+int	 lfs_match_data(struct lfs *, struct buf *);
+int	 lfs_match_dindir(struct lfs *, struct buf *);
+int	 lfs_match_indir(struct lfs *, struct buf *);
+int	 lfs_match_tindir(struct lfs *, struct buf *);
+void	 lfs_newseg(struct lfs *);
+void	 lfs_shellsort(struct buf **, ufs_daddr_t *, register int);
+void	 lfs_supercallback(struct buf *);
+void	 lfs_updatemeta(struct segment *);
+int	 lfs_vref(struct vnode *);
+void	 lfs_vunref(struct vnode *);
+void	 lfs_writefile(struct lfs *, struct segment *, struct vnode *);
+int	 lfs_writeinode(struct lfs *, struct segment *, struct inode *);
+int	 lfs_writeseg(struct lfs *, struct segment *);
+void	 lfs_writesuper(struct lfs *);
+void	 lfs_writevnodes(struct lfs *fs, struct mount *mp,
+	    struct segment *sp, int dirops);
 
 int	lfs_allclean_wakeup;		/* Cleaner wakeup address. */
 
@@ -535,7 +535,7 @@ lfs_gather(fs, sp, vp, match)
 	struct lfs *fs;
 	struct segment *sp;
 	struct vnode *vp;
-	int (*match) __P((struct lfs *, struct buf *));
+	int (*match)(struct lfs *, struct buf *);
 {
 	struct buf *bp;
 	int s;
@@ -800,7 +800,7 @@ lfs_writeseg(fs, sp)
 	dev_t i_dev;
 	u_long *datap, *dp;
 	int do_again, i, nblocks, s;
-	int (*strategy)__P((void *));
+	int (*strategy)(void *);
 	struct vop_strategy_args vop_strategy_a;
 	u_short ninos;
 	char *p;
@@ -966,7 +966,7 @@ lfs_writesuper(fs)
 {
 	struct buf *bp;
 	dev_t i_dev;
-	int (*strategy) __P((void *));
+	int (*strategy)(void *);
 	int s;
 	struct vop_strategy_args vop_strategy_a;
 
diff --git a/sys/ufs/lfs/lfs_syscalls.c b/sys/ufs/lfs/lfs_syscalls.c
index b90a6ca524e..45363d78ce8 100644
--- a/sys/ufs/lfs/lfs_syscalls.c
+++ b/sys/ufs/lfs/lfs_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lfs_syscalls.c,v 1.5 1997/05/30 08:34:45 downsj Exp $	*/
+/*	$OpenBSD: lfs_syscalls.c,v 1.6 2002/03/14 01:27:15 millert Exp $	*/
 /*	$NetBSD: lfs_syscalls.c,v 1.10 1996/02/09 22:28:56 christos Exp $	*/
 
 /*-
@@ -69,7 +69,7 @@
 if (sp->sum_bytes_left < (s)) {		\
 	(void) lfs_writeseg(fs, sp);	\
 }
-struct buf *lfs_fakebuf __P((struct vnode *, int, size_t, caddr_t));
+struct buf *lfs_fakebuf(struct vnode *, int, size_t, caddr_t);
 
 int debug_cleaner = 0;
 int clean_vnlocked = 0;
diff --git a/sys/ufs/lfs/lfs_vfsops.c b/sys/ufs/lfs/lfs_vfsops.c
index 940918be139..17193210ce6 100644
--- a/sys/ufs/lfs/lfs_vfsops.c
+++ b/sys/ufs/lfs/lfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lfs_vfsops.c,v 1.14 2002/02/22 20:37:46 drahn Exp $	*/
+/*	$OpenBSD: lfs_vfsops.c,v 1.15 2002/03/14 01:27:15 millert Exp $	*/
 /*	$NetBSD: lfs_vfsops.c,v 1.11 1996/03/25 12:53:35 pk Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
 #include <ufs/lfs/lfs.h>
 #include <ufs/lfs/lfs_extern.h>
 
-int lfs_mountfs __P((struct vnode *, struct mount *, struct proc *));
+int lfs_mountfs(struct vnode *, struct mount *, struct proc *);
 
 struct vfsops lfs_vfsops = {
 	lfs_mount,
diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c
index 05f54d91e53..ff649b68399 100644
--- a/sys/ufs/lfs/lfs_vnops.c
+++ b/sys/ufs/lfs/lfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lfs_vnops.c,v 1.6 2001/11/06 19:53:21 miod Exp $	*/
+/*	$OpenBSD: lfs_vnops.c,v 1.7 2002/03/14 01:27:15 millert Exp $	*/
 /*	$NetBSD: lfs_vnops.c,v 1.11 1996/05/11 18:27:41 mycroft Exp $	*/
 
 /*
@@ -66,7 +66,7 @@
 #include <ufs/lfs/lfs_extern.h>
 
 /* Global vfs data structures for lfs. */
-int (**lfs_vnodeop_p) __P((void *));
+int (**lfs_vnodeop_p)(void *);
 struct vnodeopv_entry_desc lfs_vnodeop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
 	{ &vop_lookup_desc, ufs_lookup },		/* lookup */
@@ -111,12 +111,12 @@ struct vnodeopv_entry_desc lfs_vnodeop_entries[] = {
 	{ &vop_truncate_desc, lfs_truncate },		/* truncate */
 	{ &vop_update_desc, lfs_update },		/* update */
 	{ &vop_bwrite_desc, lfs_bwrite },		/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
+	{ (struct vnodeop_desc*)NULL, (int(*)(void *))NULL }
 };
 struct vnodeopv_desc lfs_vnodeop_opv_desc =
 	{ &lfs_vnodeop_p, lfs_vnodeop_entries };
 
-int (**lfs_specop_p) __P((void *));
+int (**lfs_specop_p)(void *);
 struct vnodeopv_entry_desc lfs_specop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
 	{ &vop_lookup_desc, spec_lookup },		/* lookup */
@@ -160,13 +160,13 @@ struct vnodeopv_entry_desc lfs_specop_entries[] = {
 	{ &vop_truncate_desc, spec_truncate },		/* truncate */
 	{ &vop_update_desc, lfs_update },		/* update */
 	{ &vop_bwrite_desc, lfs_bwrite },		/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
+	{ (struct vnodeop_desc*)NULL, (int(*)(void *))NULL }
 };
 struct vnodeopv_desc lfs_specop_opv_desc =
 	{ &lfs_specop_p, lfs_specop_entries };
 
 #ifdef FIFO
-int (**lfs_fifoop_p) __P((void *));
+int (**lfs_fifoop_p)(void *);
 struct vnodeopv_entry_desc lfs_fifoop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
 	{ &vop_lookup_desc, fifo_lookup },		/* lookup */
@@ -210,7 +210,7 @@ struct vnodeopv_entry_desc lfs_fifoop_entries[] = {
 	{ &vop_truncate_desc, fifo_truncate },		/* truncate */
 	{ &vop_update_desc, lfs_update },		/* update */
 	{ &vop_bwrite_desc, lfs_bwrite },		/* bwrite */
-	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
+	{ (struct vnodeop_desc*)NULL, (int(*)(void *))NULL }
 };
 struct vnodeopv_desc lfs_fifoop_opv_desc =
 	{ &lfs_fifoop_p, lfs_fifoop_entries };