Remove __P.

7 files changed, 82 insertions, 92 deletions

diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index 0060364..8371246 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -61,8 +61,8 @@ static u_long isohash;
 #define	INOHASH(device, inum)	((minor(device) + ((inum)>>12)) & isohash)
 static struct mtx cd9660_ihash_mtx;
 
-static void cd9660_ihashrem __P((struct iso_node *));
-static unsigned	cd9660_chars2ui __P((unsigned char *begin, int len));
+static void cd9660_ihashrem(struct iso_node *);
+static unsigned	cd9660_chars2ui(unsigned char *begin, int len);
 
 /*
  * Initialize hash links for inodes and dnodes.
diff --git a/sys/isofs/cd9660/cd9660_node.h b/sys/isofs/cd9660/cd9660_node.h
index 2a0d7ef..47ea9dd 100644
--- a/sys/isofs/cd9660/cd9660_node.h
+++ b/sys/isofs/cd9660/cd9660_node.h
@@ -107,19 +107,19 @@ struct vop_reclaim_args;
 /*
  * Prototypes for ISOFS vnode operations
  */
-int cd9660_lookup __P((struct vop_cachedlookup_args *));
-int cd9660_inactive __P((struct vop_inactive_args *));
-int cd9660_reclaim __P((struct vop_reclaim_args *));
-int cd9660_bmap __P((struct vop_bmap_args *));
-int cd9660_blkatoff __P((struct vnode *vp, off_t offset, char **res, struct buf **bpp));
+int cd9660_lookup(struct vop_cachedlookup_args *);
+int cd9660_inactive(struct vop_inactive_args *);
+int cd9660_reclaim(struct vop_reclaim_args *);
+int cd9660_bmap(struct vop_bmap_args *);
+int cd9660_blkatoff(struct vnode *vp, off_t offset, char **res, struct buf **bpp);
 
-void cd9660_defattr __P((struct iso_directory_record *,
-			struct iso_node *, struct buf *, enum ISO_FTYPE));
-void cd9660_deftstamp __P((struct iso_directory_record *,
-			struct iso_node *, struct buf *, enum ISO_FTYPE));
-int cd9660_ihashget __P((dev_t, ino_t, int, struct vnode **));
-void cd9660_ihashins __P((struct iso_node *));
-int cd9660_tstamp_conv7 __P((u_char *, struct timespec *, enum ISO_FTYPE));
-int cd9660_tstamp_conv17 __P((u_char *, struct timespec *));
+void cd9660_defattr(struct iso_directory_record *,
+			struct iso_node *, struct buf *, enum ISO_FTYPE);
+void cd9660_deftstamp(struct iso_directory_record *,
+			struct iso_node *, struct buf *, enum ISO_FTYPE);
+int cd9660_ihashget(dev_t, ino_t, int, struct vnode **);
+void cd9660_ihashins(struct iso_node *);
+int cd9660_tstamp_conv7(u_char *, struct timespec *, enum ISO_FTYPE);
+int cd9660_tstamp_conv17(u_char *, struct timespec *);
 
 #endif /* _KERNEL */
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index 5f0a262..3703f97 100644
--- a/sys/isofs/cd9660/cd9660_rrip.c
+++ b/sys/isofs/cd9660/cd9660_rrip.c
@@ -52,44 +52,35 @@
 #include <isofs/cd9660/cd9660_rrip.h>
 #include <isofs/cd9660/iso_rrip.h>
 
-typedef int	rrt_func_t __P((void *, ISO_RRIP_ANALYZE *ana));
+typedef int	rrt_func_t(void *, ISO_RRIP_ANALYZE *ana);
 
 typedef struct {
 	char type[2];
 	rrt_func_t *func;
-	void (*func2) __P((struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana));
+	void (*func2)(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana);
 	int result;
 } RRIP_TABLE;
 
-static int	cd9660_rrip_altname __P((ISO_RRIP_ALTNAME *p,
-					 ISO_RRIP_ANALYZE *ana));
-static int	cd9660_rrip_attr __P((ISO_RRIP_ATTR *p, ISO_RRIP_ANALYZE *ana));
-static int	cd9660_rrip_cont __P((ISO_RRIP_CONT *p, ISO_RRIP_ANALYZE *ana));
-static void	cd9660_rrip_defattr __P((struct iso_directory_record *isodir,
-					 ISO_RRIP_ANALYZE *ana));
-static void	cd9660_rrip_defname __P((struct iso_directory_record *isodir,
-					 ISO_RRIP_ANALYZE *ana));
-static void	cd9660_rrip_deftstamp __P((struct iso_directory_record *isodir,
-					   ISO_RRIP_ANALYZE *ana));
-static int	cd9660_rrip_device __P((ISO_RRIP_DEVICE *p,
-					ISO_RRIP_ANALYZE *ana));
-static int	cd9660_rrip_extref __P((ISO_RRIP_EXTREF *p,
-					ISO_RRIP_ANALYZE *ana));
-static int	cd9660_rrip_idflag __P((ISO_RRIP_IDFLAG *p,
-					ISO_RRIP_ANALYZE *ana));
-static int	cd9660_rrip_loop __P((struct iso_directory_record *isodir,
+static int	cd9660_rrip_altname(ISO_RRIP_ALTNAME *p, ISO_RRIP_ANALYZE *ana);
+static int	cd9660_rrip_attr(ISO_RRIP_ATTR *p, ISO_RRIP_ANALYZE *ana);
+static int	cd9660_rrip_cont(ISO_RRIP_CONT *p, ISO_RRIP_ANALYZE *ana);
+static void	cd9660_rrip_defattr(struct iso_directory_record *isodir,
+					 ISO_RRIP_ANALYZE *ana);
+static void	cd9660_rrip_defname(struct iso_directory_record *isodir,
+					 ISO_RRIP_ANALYZE *ana);
+static void	cd9660_rrip_deftstamp(struct iso_directory_record *isodir,
+					   ISO_RRIP_ANALYZE *ana);
+static int	cd9660_rrip_device(ISO_RRIP_DEVICE *p, ISO_RRIP_ANALYZE *ana);
+static int	cd9660_rrip_extref(ISO_RRIP_EXTREF *p, ISO_RRIP_ANALYZE *ana);
+static int	cd9660_rrip_idflag(ISO_RRIP_IDFLAG *p, ISO_RRIP_ANALYZE *ana);
+static int	cd9660_rrip_loop(struct iso_directory_record *isodir,
 				      ISO_RRIP_ANALYZE *ana,
-				      RRIP_TABLE *table));
-static int	cd9660_rrip_pclink __P((ISO_RRIP_CLINK *p,
-					ISO_RRIP_ANALYZE *ana));
-static int	cd9660_rrip_reldir __P((ISO_RRIP_RELDIR *p,
-					ISO_RRIP_ANALYZE *ana));
-static int	cd9660_rrip_slink __P((ISO_RRIP_SLINK *p,
-				       ISO_RRIP_ANALYZE *ana));
-static int	cd9660_rrip_stop __P((ISO_SUSP_HEADER *p,
-				      ISO_RRIP_ANALYZE *ana));
-static int	cd9660_rrip_tstamp __P((ISO_RRIP_TSTAMP *p,
-					ISO_RRIP_ANALYZE *ana));
+				      RRIP_TABLE *table);
+static int	cd9660_rrip_pclink(ISO_RRIP_CLINK *p, ISO_RRIP_ANALYZE *ana);
+static int	cd9660_rrip_reldir(ISO_RRIP_RELDIR *p, ISO_RRIP_ANALYZE *ana);
+static int	cd9660_rrip_slink(ISO_RRIP_SLINK *p, ISO_RRIP_ANALYZE *ana);
+static int	cd9660_rrip_stop(ISO_SUSP_HEADER *p, ISO_RRIP_ANALYZE *ana);
+static int	cd9660_rrip_tstamp(ISO_RRIP_TSTAMP *p, ISO_RRIP_ANALYZE *ana);
 
 /*
  * POSIX file attribute
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 60a7b38..d3811af 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -64,14 +64,14 @@
 MALLOC_DEFINE(M_ISOFSMNT, "ISOFS mount", "ISOFS mount structure");
 MALLOC_DEFINE(M_ISOFSNODE, "ISOFS node", "ISOFS vnode private part");
 
-static int cd9660_mount __P((struct mount *,
-	    char *, caddr_t, struct nameidata *, struct thread *));
-static int cd9660_unmount __P((struct mount *, int, struct thread *));
-static int cd9660_root __P((struct mount *, struct vnode **));
-static int cd9660_statfs __P((struct mount *, struct statfs *, struct thread *));
-static int cd9660_vget __P((struct mount *, ino_t, int, struct vnode **));
-static int cd9660_fhtovp __P((struct mount *, struct fid *, struct vnode **));
-static int cd9660_vptofh __P((struct vnode *, struct fid *));
+static int cd9660_mount(struct mount *,
+	    char *, caddr_t, struct nameidata *, struct thread *);
+static int cd9660_unmount(struct mount *, int, struct thread *);
+static int cd9660_root(struct mount *, struct vnode **);
+static int cd9660_statfs(struct mount *, struct statfs *, struct thread *);
+static int cd9660_vget(struct mount *, ino_t, int, struct vnode **);
+static int cd9660_fhtovp(struct mount *, struct fid *, struct vnode **);
+static int cd9660_vptofh(struct vnode *, struct fid *);
 
 static struct vfsops cd9660_vfsops = {
 	cd9660_mount,
@@ -97,9 +97,9 @@ MODULE_VERSION(cd9660, 1);
  * Called by vfs_mountroot when iso is going to be mounted as root.
  */
 
-static int iso_get_ssector __P((dev_t dev, struct thread *td));
-static int iso_mountfs __P((struct vnode *devvp, struct mount *mp,
-			    struct thread *td, struct iso_args *argp));
+static int iso_get_ssector(dev_t dev, struct thread *td);
+static int iso_mountfs(struct vnode *devvp, struct mount *mp,
+			    struct thread *td, struct iso_args *argp);
 
 /*
  * Try to find the start of the last data track on this CD-ROM.  This
@@ -141,7 +141,7 @@ iso_get_ssector(dev, td)
 	return ntohl(t.entry.addr.lba);
 }
 
-static int iso_mountroot __P((struct mount *mp, struct thread *td));
+static int iso_mountroot(struct mount *mp, struct thread *td);
 
 static int
 iso_mountroot(mp, td)
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index a902b58..1a7d185 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -62,20 +62,19 @@
 #include <isofs/cd9660/cd9660_node.h>
 #include <isofs/cd9660/iso_rrip.h>
 
-static int cd9660_setattr __P((struct vop_setattr_args *));
-static int cd9660_access __P((struct vop_access_args *));
-static int cd9660_getattr __P((struct vop_getattr_args *));
-static int cd9660_ioctl __P((struct vop_ioctl_args *));
-static int cd9660_pathconf __P((struct vop_pathconf_args *));
-static int cd9660_read __P((struct vop_read_args *));
+static int cd9660_setattr(struct vop_setattr_args *);
+static int cd9660_access(struct vop_access_args *);
+static int cd9660_getattr(struct vop_getattr_args *);
+static int cd9660_ioctl(struct vop_ioctl_args *);
+static int cd9660_pathconf(struct vop_pathconf_args *);
+static int cd9660_read(struct vop_read_args *);
 struct isoreaddir;
-static int iso_uiodir __P((struct isoreaddir *idp, struct dirent *dp,
-			   off_t off));
-static int iso_shipdir __P((struct isoreaddir *idp));
-static int cd9660_readdir __P((struct vop_readdir_args *));
-static int cd9660_readlink __P((struct vop_readlink_args *ap));
-static int cd9660_strategy __P((struct vop_strategy_args *));
-static int cd9660_print __P((struct vop_print_args *));
+static int iso_uiodir(struct isoreaddir *idp, struct dirent *dp, off_t off);
+static int iso_shipdir(struct isoreaddir *idp);
+static int cd9660_readdir(struct vop_readdir_args *);
+static int cd9660_readlink(struct vop_readlink_args *ap);
+static int cd9660_strategy(struct vop_strategy_args *);
+static int cd9660_print(struct vop_print_args *);
 
 /*
  * Setattr call. Only allowed for block and character special devices.
diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h
index 453423a..4136e35 100644
--- a/sys/isofs/cd9660/iso.h
+++ b/sys/isofs/cd9660/iso.h
@@ -254,21 +254,21 @@ struct iso_mnt {
 #define lblkno(imp, loc)	((loc) >> (imp)->im_bshift)
 #define blksize(imp, ip, lbn)	((imp)->logical_block_size)
 
-int cd9660_vget_internal __P((struct mount *, ino_t, int, struct vnode **, int,
-			      struct iso_directory_record *));
-int cd9660_init __P((struct vfsconf *));
-int cd9660_uninit __P((struct vfsconf *));
-#define cd9660_sysctl ((int (*) __P((int *, u_int, void *, size_t *, void *, \
-                                    size_t, struct proc *)))eopnotsupp)
+int cd9660_vget_internal(struct mount *, ino_t, int, struct vnode **, int,
+			      struct iso_directory_record *);
+int cd9660_init(struct vfsconf *);
+int cd9660_uninit(struct vfsconf *);
+#define cd9660_sysctl ((int (*)(int *, u_int, void *, size_t *, void *, \
+                                    size_t, struct proc *))eopnotsupp)
 
 extern vop_t **cd9660_vnodeop_p;
 extern vop_t **cd9660_specop_p;
 extern vop_t **cd9660_fifoop_p;
 
-int isochar __P((u_char *, u_char *, int, u_char *));
-int isofncmp __P((u_char *, int, 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(u_char *, u_char *, int, u_char *);
+int isofncmp(u_char *, int, 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 *);
 
 #endif /* _KERNEL */
 
@@ -277,7 +277,7 @@ ino_t isodirino __P((struct iso_directory_record *, struct iso_mnt *));
  * outside the kernel.  Thus we don't hide them here.
  */
 
-static __inline int isonum_711 __P((u_char *));
+static __inline int isonum_711(u_char *);
 static __inline int
 isonum_711(p)
 	u_char *p;
@@ -285,7 +285,7 @@ isonum_711(p)
 	return *p;
 }
 
-static __inline int isonum_712 __P((char *));
+static __inline int isonum_712(char *);
 static __inline int
 isonum_712(p)
 	char *p;
@@ -295,7 +295,7 @@ isonum_712(p)
 
 #ifndef UNALIGNED_ACCESS
 
-static __inline int isonum_723 __P((u_char *));
+static __inline int isonum_723(u_char *);
 static __inline int
 isonum_723(p)
 	u_char *p;
@@ -303,7 +303,7 @@ isonum_723(p)
 	return *p|(p[1] << 8);
 }
 
-static __inline int isonum_733 __P((u_char *));
+static __inline int isonum_733(u_char *);
 static __inline int
 isonum_733(p)
 	u_char *p;
diff --git a/sys/isofs/cd9660/iso_rrip.h b/sys/isofs/cd9660/iso_rrip.h
index 0c06e98..313918f 100644
--- a/sys/isofs/cd9660/iso_rrip.h
+++ b/sys/isofs/cd9660/iso_rrip.h
@@ -74,13 +74,13 @@ typedef struct {
 
 struct iso_directory_record;
 
-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);