First round of __P removal in sys

8 files changed, 119 insertions, 119 deletions

diff --git a/sys/isofs/cd9660/cd9660_extern.h b/sys/isofs/cd9660/cd9660_extern.h
index 7c57a3cb23e..83fc029ca53 100644
--- a/sys/isofs/cd9660/cd9660_extern.h
+++ b/sys/isofs/cd9660/cd9660_extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_extern.h,v 1.6 2001/02/20 01:50:08 assar Exp $	*/
+/*	$OpenBSD: cd9660_extern.h,v 1.7 2002/03/14 01:27:03 millert Exp $	*/
 /*	$NetBSD: cd9660_extern.h,v 1.1 1997/01/24 00:24:53 cgd Exp $	*/
 
 /*-
@@ -84,32 +84,32 @@ struct iso_mnt {
 #define lblkno(imp, loc)	((loc) >> (imp)->im_bshift)
 #define blksize(imp, ip, lbn)	((imp)->logical_block_size)
 
-int cd9660_mount __P((struct mount *, const char *, void *,
-                      struct nameidata *, struct proc *));
-int cd9660_start __P((struct mount *, int, struct proc *));
-int cd9660_unmount __P((struct mount *, int, struct proc *));
-int cd9660_root __P((struct mount *, struct vnode **));
-int cd9660_quotactl __P((struct mount *, int, uid_t, caddr_t, struct proc *));
-int cd9660_statfs __P((struct mount *, struct statfs *, struct proc *));
-int cd9660_sync __P((struct mount *, int, struct ucred *, struct proc *));
-int cd9660_vget __P((struct mount *, ino_t, struct vnode **));
-int cd9660_fhtovp __P((struct mount *, struct fid *, struct vnode **));
-int cd9660_vptofh __P((struct vnode *, struct fid *));
-int cd9660_init __P((struct vfsconf *));
-int cd9660_check_export __P((struct mount *, struct mbuf *, int *,
-                             struct ucred **));
-#define cd9660_sysctl ((int (*) __P((int *, u_int, void *, size_t *, void *, \
-                                    size_t, struct proc *)))eopnotsupp)
+int cd9660_mount(struct mount *, const char *, void *,
+                      struct nameidata *, struct proc *);
+int cd9660_start(struct mount *, int, struct proc *);
+int cd9660_unmount(struct mount *, int, struct proc *);
+int cd9660_root(struct mount *, struct vnode **);
+int cd9660_quotactl(struct mount *, int, uid_t, caddr_t, struct proc *);
+int cd9660_statfs(struct mount *, struct statfs *, struct proc *);
+int cd9660_sync(struct mount *, int, struct ucred *, struct proc *);
+int cd9660_vget(struct mount *, ino_t, struct vnode **);
+int cd9660_fhtovp(struct mount *, struct fid *, struct vnode **);
+int cd9660_vptofh(struct vnode *, struct fid *);
+int cd9660_init(struct vfsconf *);
+int cd9660_check_export(struct mount *, struct mbuf *, int *,
+                             struct ucred **);
+#define cd9660_sysctl ((int (*)(int *, u_int, void *, size_t *, void *, \
+                                    size_t, struct proc *))eopnotsupp)
 
-int cd9660_mountroot __P((void)); 
+int cd9660_mountroot(void); 
 
-extern int (**cd9660_vnodeop_p) __P((void *));
-extern int (**cd9660_specop_p) __P((void *));
+extern int (**cd9660_vnodeop_p)(void *);
+extern int (**cd9660_specop_p)(void *);
 #ifdef FIFO
-extern int (**cd9660_fifoop_p) __P((void *));
+extern int (**cd9660_fifoop_p)(void *);
 #endif
 
-int isochar __P((const u_char *, const u_char *, int, u_char *));
-int isofncmp __P((const u_char *, int, const u_char *, int, int));
-void isofntrans __P((u_char *, int, u_char *, u_short *, int, int, int));
-ino_t isodirino __P((struct iso_directory_record *, struct iso_mnt *));
+int isochar(const u_char *, const u_char *, int, u_char *);
+int isofncmp(const u_char *, int, const u_char *, int, int);
+void isofntrans(u_char *, int, u_char *, u_short *, int, int, int);
+ino_t isodirino(struct iso_directory_record *, struct iso_mnt *);
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index 29936b7ba4c..8d973610423 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_node.c,v 1.11 2001/06/23 02:14:22 csapuntz Exp $	*/
+/*	$OpenBSD: cd9660_node.c,v 1.12 2002/03/14 01:27:03 millert Exp $	*/
 /*	$NetBSD: cd9660_node.c,v 1.17 1997/05/05 07:13:57 mycroft Exp $	*/
 
 /*-
@@ -74,7 +74,7 @@ u_long idvhash;
 
 int prtactive;	/* 1 => print out reclaim of active vnodes */
 
-static u_int cd9660_chars2ui __P((u_char *, int));
+static u_int cd9660_chars2ui(u_char *, int);
 
 /*
  * Initialize hash links for inodes and dnodes.
diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h
index a1b70cf4a79..aebd1889cec 100644
--- a/sys/isofs/cd9660/cd9660_node.h
+++ b/sys/isofs/cd9660/cd9660_node.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_node.h,v 1.13 2001/12/19 08:58:06 art Exp $	*/
+/*	$OpenBSD: cd9660_node.h,v 1.14 2002/03/14 01:27:03 millert Exp $	*/
 /*	$NetBSD: cd9660_node.h,v 1.15 1997/04/11 21:52:01 kleink Exp $	*/
 
 /*-
@@ -111,47 +111,47 @@ struct iso_node {
 /*
  * Prototypes for ISOFS vnode operations
  */
-int	cd9660_lookup __P((void *));
-int	cd9660_open __P((void *));
-int	cd9660_close __P((void *));
-int	cd9660_access __P((void *));
-int	cd9660_getattr __P((void *));
-int	cd9660_setattr __P((void *));
-int	cd9660_read __P((void *));
-int	cd9660_ioctl __P((void *));
-int	cd9660_select __P((void *));
-int	cd9660_mmap __P((void *));
-int	cd9660_seek __P((void *));
-int	cd9660_readdir __P((void *));
-int	cd9660_readlink __P((void *));
-int	cd9660_abortop __P((void *));
-int	cd9660_inactive __P((void *));
-int	cd9660_reclaim __P((void *));
-int	cd9660_link __P((void *));
-int	cd9660_symlink __P((void *));
-int	cd9660_bmap __P((void *));
-int	cd9660_lock __P((void *));
-int	cd9660_unlock __P((void *));
-int	cd9660_strategy __P((void *));
-int	cd9660_print __P((void *));
-int	cd9660_islocked __P((void *));
-int	cd9660_pathconf __P((void *));
+int	cd9660_lookup(void *);
+int	cd9660_open(void *);
+int	cd9660_close(void *);
+int	cd9660_access(void *);
+int	cd9660_getattr(void *);
+int	cd9660_setattr(void *);
+int	cd9660_read(void *);
+int	cd9660_ioctl(void *);
+int	cd9660_select(void *);
+int	cd9660_mmap(void *);
+int	cd9660_seek(void *);
+int	cd9660_readdir(void *);
+int	cd9660_readlink(void *);
+int	cd9660_abortop(void *);
+int	cd9660_inactive(void *);
+int	cd9660_reclaim(void *);
+int	cd9660_link(void *);
+int	cd9660_symlink(void *);
+int	cd9660_bmap(void *);
+int	cd9660_lock(void *);
+int	cd9660_unlock(void *);
+int	cd9660_strategy(void *);
+int	cd9660_print(void *);
+int	cd9660_islocked(void *);
+int	cd9660_pathconf(void *);
 
 int	cd9660_bufatoff(struct iso_node *, off_t, char **, struct buf **);
 
-void	cd9660_defattr __P((struct iso_directory_record *, struct iso_node *,
-    struct buf *));
-void	cd9660_deftstamp __P((struct iso_directory_record *, struct iso_node *,
-    struct buf *));
-struct	vnode *cd9660_ihashget __P((dev_t, ino_t));
-int	cd9660_ihashins __P((struct iso_node *));
-void	cd9660_ihashrem __P((struct iso_node *));
-int	cd9660_tstamp_conv7 __P((u_char *, struct timespec *));
-int	cd9660_tstamp_conv17 __P((u_char *, struct timespec *));
-int	cd9660_vget_internal __P((struct mount *, ino_t, struct vnode **, int,
-    struct iso_directory_record *));
-ino_t	isodirino __P((struct iso_directory_record *, struct iso_mnt *));
+void	cd9660_defattr(struct iso_directory_record *, struct iso_node *,
+    struct buf *);
+void	cd9660_deftstamp(struct iso_directory_record *, struct iso_node *,
+    struct buf *);
+struct	vnode *cd9660_ihashget(dev_t, ino_t);
+int	cd9660_ihashins(struct iso_node *);
+void	cd9660_ihashrem(struct iso_node *);
+int	cd9660_tstamp_conv7(u_char *, struct timespec *);
+int	cd9660_tstamp_conv17(u_char *, struct timespec *);
+int	cd9660_vget_internal(struct mount *, ino_t, struct vnode **, int,
+    struct iso_directory_record *);
+ino_t	isodirino(struct iso_directory_record *, struct iso_mnt *);
 #ifdef	ISODEVMAP
-struct	iso_dnode *iso_dmap __P((dev_t, ino_t, int));
-void	iso_dunmap __P((dev_t));
+struct	iso_dnode *iso_dmap(dev_t, ino_t, int);
+void	iso_dunmap(dev_t);
 #endif
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index 2b050435eb3..db1f0e6e0d7 100644
--- a/sys/isofs/cd9660/cd9660_rrip.c
+++ b/sys/isofs/cd9660/cd9660_rrip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_rrip.c,v 1.5 1999/07/01 02:20:21 d Exp $	*/
+/*	$OpenBSD: cd9660_rrip.c,v 1.6 2002/03/14 01:27:03 millert Exp $	*/
 /*	$NetBSD: cd9660_rrip.c,v 1.17 1997/01/24 00:27:32 cgd Exp $	*/
 
 /*-
@@ -62,27 +62,27 @@
 
 typedef struct {
 	char type[2];
-	int (*func) __P((void *, ISO_RRIP_ANALYZE *));
-	void (*func2) __P((void *, ISO_RRIP_ANALYZE *));
+	int (*func)(void *, ISO_RRIP_ANALYZE *);
+	void (*func2)(void *, ISO_RRIP_ANALYZE *);
 	int result;
 } RRIP_TABLE;
 
-static int cd9660_rrip_attr __P((void *, ISO_RRIP_ANALYZE *));
-static void cd9660_rrip_defattr __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_slink __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_altname __P((void *, ISO_RRIP_ANALYZE *));
-static void cd9660_rrip_defname __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_pclink __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_reldir __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_tstamp __P((void *, ISO_RRIP_ANALYZE *));
-static void cd9660_rrip_deftstamp __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_device __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_idflag __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_cont __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_stop __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_extref __P((void *, ISO_RRIP_ANALYZE *));
-static int cd9660_rrip_loop __P((struct iso_directory_record *,
-    ISO_RRIP_ANALYZE *, RRIP_TABLE *));
+static int cd9660_rrip_attr(void *, ISO_RRIP_ANALYZE *);
+static void cd9660_rrip_defattr(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_slink(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_altname(void *, ISO_RRIP_ANALYZE *);
+static void cd9660_rrip_defname(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_pclink(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_reldir(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_tstamp(void *, ISO_RRIP_ANALYZE *);
+static void cd9660_rrip_deftstamp(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_device(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_idflag(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_cont(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_stop(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_extref(void *, ISO_RRIP_ANALYZE *);
+static int cd9660_rrip_loop(struct iso_directory_record *,
+    ISO_RRIP_ANALYZE *, RRIP_TABLE *);
 /*
  * POSIX file attribute
  */
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 354295c5bb0..1e0e3cf55a7 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_vfsops.c,v 1.29 2002/03/10 03:34:35 fgsch Exp $	*/
+/*	$OpenBSD: cd9660_vfsops.c,v 1.30 2002/03/14 01:27:03 millert Exp $	*/
 /*	$NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $	*/
 
 /*-
@@ -86,9 +86,9 @@ struct vfsops cd9660_vfsops = {
  * Called by vfs_mountroot when iso is going to be mounted as root.
  */
 
-static	int iso_mountfs __P((struct vnode *devvp, struct mount *mp,
-    struct proc *p, struct iso_args *argp));
-int	iso_disklabelspoof __P((dev_t dev, void (*strat) __P((struct buf *)),
+static	int iso_mountfs(struct vnode *devvp, struct mount *mp,
+    struct proc *p, struct iso_args *argp);
+int	iso_disklabelspoof __P((dev_t dev, void (*strat)(struct buf *),
     struct disklabel *lp));
 
 int
@@ -451,7 +451,7 @@ out:
 int
 iso_disklabelspoof(dev, strat, lp)
 	dev_t dev;
-	void (*strat) __P((struct buf *));
+	void (*strat)(struct buf *);
 	register struct disklabel *lp;
 {
 	struct buf *bp = NULL;
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 537878c775c..86e5c2d0483 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_vnops.c,v 1.20 2001/12/19 08:58:06 art Exp $	*/
+/*	$OpenBSD: cd9660_vnops.c,v 1.21 2002/03/14 01:27:03 millert Exp $	*/
 /*	$NetBSD: cd9660_vnops.c,v 1.42 1997/10/16 23:56:57 christos Exp $	*/
 
 /*-
@@ -84,8 +84,8 @@ struct isoreaddir {
 	int ncookies;
 };
 
-int	iso_uiodir __P((struct isoreaddir *, struct dirent *, off_t));
-int	iso_shipdir __P((struct isoreaddir *));
+int	iso_uiodir(struct isoreaddir *, struct dirent *, off_t);
+int	iso_shipdir(struct isoreaddir *);
 
 #if 0
 /*
@@ -986,7 +986,7 @@ cd9660_pathconf(v)
 #define	cd9660_mknod	eopnotsupp
 #define	cd9660_write	eopnotsupp
 #ifdef	NFSSERVER
-int	lease_check	__P((void *));
+int	lease_check(void *);
 #define	cd9660_lease_check	lease_check
 #else
 #define	cd9660_lease_check	nullop
@@ -1007,7 +1007,7 @@ int	lease_check	__P((void *));
 /*
  * Global vfs data structures for cd9660
  */
-int (**cd9660_vnodeop_p) __P((void *));
+int (**cd9660_vnodeop_p)(void *);
 struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
 	{ &vop_lookup_desc, cd9660_lookup },	/* lookup */
@@ -1045,7 +1045,7 @@ struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
 	{ &vop_pathconf_desc, cd9660_pathconf },/* pathconf */
 	{ &vop_advlock_desc, cd9660_advlock },	/* advlock */
 	{ &vop_bwrite_desc, vop_generic_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
+	{ (struct vnodeop_desc*)NULL, (int(*)(void *))NULL }
 };
 struct vnodeopv_desc cd9660_vnodeop_opv_desc =
 	{ &cd9660_vnodeop_p, cd9660_vnodeop_entries };
@@ -1053,7 +1053,7 @@ struct vnodeopv_desc cd9660_vnodeop_opv_desc =
 /*
  * Special device vnode ops
  */
-int (**cd9660_specop_p) __P((void *));
+int (**cd9660_specop_p)(void *);
 struct vnodeopv_entry_desc cd9660_specop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
 	{ &vop_lookup_desc, spec_lookup },	/* lookup */
@@ -1091,13 +1091,13 @@ struct vnodeopv_entry_desc cd9660_specop_entries[] = {
 	{ &vop_pathconf_desc, spec_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, spec_advlock },	/* advlock */
 	{ &vop_bwrite_desc, vop_generic_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
+	{ (struct vnodeop_desc*)NULL, (int(*)(void *))NULL }
 };
 struct vnodeopv_desc cd9660_specop_opv_desc =
 	{ &cd9660_specop_p, cd9660_specop_entries };
 
 #ifdef FIFO
-int (**cd9660_fifoop_p) __P((void *));
+int (**cd9660_fifoop_p)(void *);
 struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
 	{ &vop_default_desc, vn_default_error },
 	{ &vop_lookup_desc, fifo_lookup },	/* lookup */
@@ -1135,7 +1135,7 @@ struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
 	{ &vop_pathconf_desc, fifo_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, fifo_advlock },	/* advlock */
 	{ &vop_bwrite_desc, vop_generic_bwrite },
-	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
+	{ (struct vnodeop_desc*)NULL, (int(*)(void *))NULL }
 };
 struct vnodeopv_desc cd9660_fifoop_opv_desc =
 	{ &cd9660_fifoop_p, cd9660_fifoop_entries };
diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h
index f9b950957d6..89b5650a605 100644
--- a/sys/isofs/cd9660/iso.h
+++ b/sys/isofs/cd9660/iso.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iso.h,v 1.10 2000/12/06 17:18:42 deraadt Exp $	*/
+/*	$OpenBSD: iso.h,v 1.11 2002/03/14 01:27:03 millert Exp $	*/
 /*	$NetBSD: iso.h,v 1.20 1997/07/07 22:45:34 cgd Exp $	*/
 
 /*-
@@ -179,14 +179,14 @@ struct iso_extended_attributes {
 	u_char len_au			[ISODCL (247, 250)]; /* 723 */
 };
 
-static __inline int isonum_711 __P((u_char *)) __attribute__ ((__unused__));
-static __inline int isonum_712 __P((char *)) __attribute__ ((__unused__));
-static __inline int isonum_721 __P((u_char *)) __attribute__ ((__unused__));
-static __inline int isonum_722 __P((u_char *)) __attribute__ ((__unused__));
-static __inline int isonum_723 __P((u_char *)) __attribute__ ((__unused__));
-static __inline int isonum_731 __P((u_char *)) __attribute__ ((__unused__));
-static __inline int isonum_732 __P((u_char *)) __attribute__ ((__unused__));
-static __inline int isonum_733 __P((u_char *)) __attribute__ ((__unused__));
+static __inline int isonum_711(u_char *) __attribute__ ((__unused__));
+static __inline int isonum_712(char *) __attribute__ ((__unused__));
+static __inline int isonum_721(u_char *) __attribute__ ((__unused__));
+static __inline int isonum_722(u_char *) __attribute__ ((__unused__));
+static __inline int isonum_723(u_char *) __attribute__ ((__unused__));
+static __inline int isonum_731(u_char *) __attribute__ ((__unused__));
+static __inline int isonum_732(u_char *) __attribute__ ((__unused__));
+static __inline int isonum_733(u_char *) __attribute__ ((__unused__));
 
 /* 7.1.1: unsigned char */
 static __inline int
diff --git a/sys/isofs/cd9660/iso_rrip.h b/sys/isofs/cd9660/iso_rrip.h
index 5def61a9ee4..e0348f6ee43 100644
--- a/sys/isofs/cd9660/iso_rrip.h
+++ b/sys/isofs/cd9660/iso_rrip.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iso_rrip.h,v 1.2 1997/02/24 14:30:50 niklas Exp $	*/
+/*	$OpenBSD: iso_rrip.h,v 1.3 2002/03/14 01:27:03 millert Exp $	*/
 /*	$NetBSD: iso_rrip.h,v 1.3 1994/06/29 06:32:02 cgd Exp $	*/
 
 /*-
@@ -74,13 +74,13 @@ typedef struct {
 	int		cont;		/* continuation of above */
 } ISO_RRIP_ANALYZE;
 
-int cd9660_rrip_analyze __P((struct iso_directory_record *isodir,
-			    struct iso_node *inop, struct iso_mnt *imp));
-int cd9660_rrip_getname __P((struct iso_directory_record *isodir,
+int cd9660_rrip_analyze(struct iso_directory_record *isodir,
+			    struct iso_node *inop, struct iso_mnt *imp);
+int cd9660_rrip_getname(struct iso_directory_record *isodir,
 			    char *outbuf, u_short *outlen,
-			    ino_t *inump, struct iso_mnt *imp));
-int cd9660_rrip_getsymname __P((struct iso_directory_record *isodir,
+			    ino_t *inump, struct iso_mnt *imp);
+int cd9660_rrip_getsymname(struct iso_directory_record *isodir,
 			       char *outbuf, u_short *outlen,
-			       struct iso_mnt *imp));
-int cd9660_rrip_offset __P((struct iso_directory_record *isodir,
-			   struct iso_mnt *imp));
+			       struct iso_mnt *imp);
+int cd9660_rrip_offset(struct iso_directory_record *isodir,
+			   struct iso_mnt *imp);