From: jsg <jsg@openbsd.org>
Date: Fri, 5 Mar 2021 07:01:36 +0000 (+0000)
Subject: ansi
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1bf87d88f063f914bd0f0ee17c63bf56f6443f75;p=openbsd

ansi
---

diff --git a/sys/isofs/cd9660/cd9660_bmap.c b/sys/isofs/cd9660/cd9660_bmap.c
index 17840a1520a..bb1066b5772 100644
--- a/sys/isofs/cd9660/cd9660_bmap.c
+++ b/sys/isofs/cd9660/cd9660_bmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_bmap.c,v 1.9 2017/12/30 20:47:00 guenther Exp $	*/
+/*	$OpenBSD: cd9660_bmap.c,v 1.10 2021/03/05 07:01:36 jsg Exp $	*/
 /*	$NetBSD: cd9660_bmap.c,v 1.7 1997/01/24 00:27:29 cgd Exp $	*/
 
 /*-
@@ -54,8 +54,7 @@
  * number to index into the data block (extent) for the file.
  */
 int
-cd9660_bmap(v)
-	void *v;
+cd9660_bmap(void *v)
 {
 	struct vop_bmap_args *ap = v;
 	struct iso_node *ip = VTOI(ap->a_vp);
diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c
index 855ab904672..757e6203aa0 100644
--- a/sys/isofs/cd9660/cd9660_lookup.c
+++ b/sys/isofs/cd9660/cd9660_lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_lookup.c,v 1.27 2018/05/02 02:24:55 visa Exp $	*/
+/*	$OpenBSD: cd9660_lookup.c,v 1.28 2021/03/05 07:01:36 jsg Exp $	*/
 /*	$NetBSD: cd9660_lookup.c,v 1.18 1997/05/08 16:19:59 mycroft Exp $	*/
 
 /*-
@@ -91,8 +91,7 @@ struct	nchstats iso_nchstats;
  * NOTE: (LOOKUP | LOCKPARENT) currently returns the parent inode unlocked.
  */
 int
-cd9660_lookup(v)
-	void *v;
+cd9660_lookup(void *v)
 {
 	struct vop_lookup_args *ap = v;
 	register struct vnode *vdp;	/* vnode for directory being searched */
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index 25c652b1f9b..321deacf9c3 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.35 2020/02/27 09:10:31 mpi Exp $	*/
+/*	$OpenBSD: cd9660_node.c,v 1.36 2021/03/05 07:01:36 jsg Exp $	*/
 /*	$NetBSD: cd9660_node.c,v 1.17 1997/05/05 07:13:57 mycroft Exp $	*/
 
 /*-
@@ -72,8 +72,7 @@ static u_int cd9660_chars2ui(u_char *, int);
  * Initialize hash links for inodes and dnodes.
  */
 int
-cd9660_init(vfsp)
-	struct vfsconf *vfsp;
+cd9660_init(struct vfsconf *vfsp)
 {
 
 	isohashtbl = hashinit(initialvnodes, M_ISOFSMNT, M_WAITOK, &isohash);
@@ -97,9 +96,7 @@ cd9660_isohash(dev_t device, cdino_t inum)
  * to it. If it is in core, but locked, wait for it.
  */
 struct vnode *
-cd9660_ihashget(dev, inum)
-	dev_t dev;
-	cdino_t inum;
+cd9660_ihashget(dev_t dev, cdino_t inum)
 {
 	struct iso_node *ip;
 	struct vnode *vp;
@@ -123,8 +120,7 @@ loop:
  * Insert the inode into the hash table, and return it locked.
  */
 int
-cd9660_ihashins(ip)
-	struct iso_node *ip;
+cd9660_ihashins(struct iso_node *ip)
 {
 	struct iso_node **ipp, *iq;
 
@@ -153,8 +149,7 @@ cd9660_ihashins(ip)
  * Remove the inode from the hash table.
  */
 void
-cd9660_ihashrem(ip)
-	register struct iso_node *ip;
+cd9660_ihashrem(struct iso_node *ip)
 {
 	register struct iso_node *iq;
 
@@ -177,8 +172,7 @@ cd9660_ihashrem(ip)
  * truncate and deallocate the file.
  */
 int
-cd9660_inactive(v)
-	void *v;
+cd9660_inactive(void *v)
 {
 	struct vop_inactive_args *ap = v;
 	struct vnode *vp = ap->a_vp;
@@ -206,8 +200,7 @@ cd9660_inactive(v)
  * Reclaim an inode so that it can be used for other purposes.
  */
 int
-cd9660_reclaim(v)
-	void *v;
+cd9660_reclaim(void *v)
 {
 	struct vop_reclaim_args *ap = v;
 	register struct vnode *vp = ap->a_vp;
@@ -239,10 +232,8 @@ cd9660_reclaim(v)
  * File attributes
  */
 void
-cd9660_defattr(isodir, inop, bp)
-	struct iso_directory_record *isodir;
-	struct iso_node *inop;
-	struct buf *bp;
+cd9660_defattr(struct iso_directory_record *isodir, struct iso_node *inop,
+    struct buf *bp)
 {
 	struct buf *bp2 = NULL;
 	struct iso_mnt *imp;
@@ -302,10 +293,8 @@ cd9660_defattr(isodir, inop, bp)
  * Time stamps
  */
 void
-cd9660_deftstamp(isodir,inop,bp)
-	struct iso_directory_record *isodir;
-	struct iso_node *inop;
-	struct buf *bp;
+cd9660_deftstamp(struct iso_directory_record *isodir, struct iso_node *inop,
+    struct buf *bp)
 {
 	struct buf *bp2 = NULL;
 	struct iso_mnt *imp;
@@ -342,9 +331,7 @@ cd9660_deftstamp(isodir,inop,bp)
 }
 
 int
-cd9660_tstamp_conv7(pi,pu)
-	u_char *pi;
-	struct timespec *pu;
+cd9660_tstamp_conv7(u_char *pi, struct timespec *pu)
 {
 	int crtime, days;
 	int y, m, d, hour, minute, second;
@@ -386,9 +373,7 @@ cd9660_tstamp_conv7(pi,pu)
 }
 
 static u_int
-cd9660_chars2ui(begin,len)
-	u_char *begin;
-	int len;
+cd9660_chars2ui(u_char *begin, int len)
 {
 	u_int rc;
 	
@@ -400,9 +385,7 @@ cd9660_chars2ui(begin,len)
 }
 
 int
-cd9660_tstamp_conv17(pi,pu)
-	u_char *pi;
-	struct timespec *pu;
+cd9660_tstamp_conv17(u_char *pi, struct timespec *pu)
 {
 	u_char buf[7];
 	
@@ -431,9 +414,7 @@ cd9660_tstamp_conv17(pi,pu)
 }
 
 cdino_t
-isodirino(isodir, imp)
-	struct iso_directory_record *isodir;
-	struct iso_mnt *imp;
+isodirino(struct iso_directory_record *isodir, struct iso_mnt *imp)
 {
 	cdino_t ino;
 
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index f9af8b8dbae..88cd51a3354 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.14 2017/09/08 05:36:53 deraadt Exp $	*/
+/*	$OpenBSD: cd9660_rrip.c,v 1.15 2021/03/05 07:01:36 jsg Exp $	*/
 /*	$NetBSD: cd9660_rrip.c,v 1.17 1997/01/24 00:27:32 cgd Exp $	*/
 
 /*-
@@ -81,9 +81,7 @@ static int cd9660_rrip_loop(struct iso_directory_record *,
  * POSIX file attribute
  */
 static int
-cd9660_rrip_attr(v, ana)
-	void *v;
-	ISO_RRIP_ANALYZE *ana;
+cd9660_rrip_attr(void *v, ISO_RRIP_ANALYZE *ana)
 {
 	ISO_RRIP_ATTR *p = v;
 
@@ -96,9 +94,7 @@ cd9660_rrip_attr(v, ana)
 }
 
 static void
-cd9660_rrip_defattr(v, ana)
-	void *v;
-	ISO_RRIP_ANALYZE *ana;
+cd9660_rrip_defattr(void *v, ISO_RRIP_ANALYZE *ana)
 {
 	struct iso_directory_record *isodir = v;
 
@@ -111,9 +107,7 @@ cd9660_rrip_defattr(v, ana)
  * Symbolic Links
  */
 static int
-cd9660_rrip_slink(v, ana)
-	void *v;
-	ISO_RRIP_ANALYZE *ana;
+cd9660_rrip_slink(void *v, ISO_RRIP_ANALYZE *ana)
 {
 	ISO_RRIP_SLINK  *p = v;
 	register ISO_RRIP_SLINK_COMPONENT *pcomp;
@@ -222,9 +216,7 @@ cd9660_rrip_slink(v, ana)
  * Alternate name
  */
 static int
-cd9660_rrip_altname(v, ana)
-	void *v;
-	ISO_RRIP_ANALYZE *ana;
+cd9660_rrip_altname(void *v, ISO_RRIP_ANALYZE *ana)
 {
 	ISO_RRIP_ALTNAME *p = v;
 	char *inbuf;
@@ -286,9 +278,7 @@ cd9660_rrip_altname(v, ana)
 }
 
 static void
-cd9660_rrip_defname(v, ana)
-	void *v;
-	ISO_RRIP_ANALYZE *ana;
+cd9660_rrip_defname(void *v, ISO_RRIP_ANALYZE *ana)
 {
 	struct iso_directory_record *isodir = v;
 
@@ -312,9 +302,7 @@ cd9660_rrip_defname(v, ana)
  * Parent or Child Link
  */
 static int
-cd9660_rrip_pclink(v, ana)
-	void *v;
-	ISO_RRIP_ANALYZE *ana;
+cd9660_rrip_pclink(void *v, ISO_RRIP_ANALYZE *ana)
 {
 	ISO_RRIP_CLINK  *p = v;
 
@@ -328,9 +316,7 @@ cd9660_rrip_pclink(v, ana)
  */
 /*ARGSUSED*/
 static int
-cd9660_rrip_reldir(v, ana)
-	void *v;
-	ISO_RRIP_ANALYZE *ana;
+cd9660_rrip_reldir(void *v, ISO_RRIP_ANALYZE *ana)
 {
 	/* special hack to make caller aware of RE field */
 	*ana->outlen = 0;
@@ -340,9 +326,7 @@ cd9660_rrip_reldir(v, ana)
 }
 
 static int
-cd9660_rrip_tstamp(v, ana)
-	void *v;
-	ISO_RRIP_ANALYZE *ana;
+cd9660_rrip_tstamp(void *v, ISO_RRIP_ANALYZE *ana)
 {
 	ISO_RRIP_TSTAMP *p = v;
 	u_char *ptime;
@@ -410,9 +394,7 @@ cd9660_rrip_tstamp(v, ana)
 }
 
 static void
-cd9660_rrip_deftstamp(v, ana)
-	void *v;
-	ISO_RRIP_ANALYZE *ana;
+cd9660_rrip_deftstamp(void *v, ISO_RRIP_ANALYZE *ana)
 {
 	struct iso_directory_record  *isodir = v;
 
@@ -423,9 +405,7 @@ cd9660_rrip_deftstamp(v, ana)
  * POSIX device modes
  */
 static int
-cd9660_rrip_device(v, ana)
-	void *v;
-	ISO_RRIP_ANALYZE *ana;
+cd9660_rrip_device(void *v, ISO_RRIP_ANALYZE *ana)
 {
 	ISO_RRIP_DEVICE *p = v;
 	u_int high, low;
@@ -445,9 +425,7 @@ cd9660_rrip_device(v, ana)
  * Flag indicating
  */
 static int
-cd9660_rrip_idflag(v, ana)
-	void *v;
-	ISO_RRIP_ANALYZE *ana;
+cd9660_rrip_idflag(void *v, ISO_RRIP_ANALYZE *ana)
 {
 	ISO_RRIP_IDFLAG *p = v;
 
@@ -464,9 +442,7 @@ cd9660_rrip_idflag(v, ana)
  * Continuation pointer
  */
 static int
-cd9660_rrip_cont(v, ana)
-	void *v;
-	ISO_RRIP_ANALYZE *ana;
+cd9660_rrip_cont(void *v, ISO_RRIP_ANALYZE *ana)
 {
 	ISO_RRIP_CONT *p = v;
 
@@ -480,9 +456,7 @@ cd9660_rrip_cont(v, ana)
  * System Use end
  */
 static int
-cd9660_rrip_stop(v, ana)
-	void *v;
-	ISO_RRIP_ANALYZE *ana;
+cd9660_rrip_stop(void *v, ISO_RRIP_ANALYZE *ana)
 {
 	return (ISO_SUSP_STOP);
 }
@@ -491,9 +465,7 @@ cd9660_rrip_stop(v, ana)
  * Extension reference
  */
 static int
-cd9660_rrip_extref(v, ana)
-	void *v;
-	ISO_RRIP_ANALYZE *ana;
+cd9660_rrip_extref(void *v, ISO_RRIP_ANALYZE *ana)
 {
 	ISO_RRIP_EXTREF *p = v;
 
@@ -515,10 +487,8 @@ cd9660_rrip_extref(v, ana)
 
 
 static int
-cd9660_rrip_loop(isodir, ana, table)
-	struct iso_directory_record *isodir;
-	ISO_RRIP_ANALYZE *ana;
-	RRIP_TABLE *table;
+cd9660_rrip_loop(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana,
+    RRIP_TABLE *table)
 {
 	register RRIP_TABLE *ptable;
 	register ISO_SUSP_HEADER *phead;
@@ -632,10 +602,8 @@ static RRIP_TABLE rrip_table_analyze[] = {
 };
 
 int
-cd9660_rrip_analyze(isodir, inop, imp)
-	struct iso_directory_record *isodir;
-	struct iso_node *inop;
-	struct iso_mnt *imp;
+cd9660_rrip_analyze(struct iso_directory_record *isodir, struct iso_node *inop,
+    struct iso_mnt *imp)
 {
 	ISO_RRIP_ANALYZE analyze;
 	
@@ -669,12 +637,8 @@ static RRIP_TABLE rrip_table_getname[] = {
 };
 
 int
-cd9660_rrip_getname(isodir, outbuf, outlen, inump, imp)
-	struct iso_directory_record *isodir;
-	char *outbuf;
-	u_short *outlen;
-	cdino_t *inump;
-	struct iso_mnt *imp;
+cd9660_rrip_getname(struct iso_directory_record *isodir, char *outbuf,
+    u_short *outlen, cdino_t *inump, struct iso_mnt *imp)
 {
 	ISO_RRIP_ANALYZE analyze;
 	RRIP_TABLE *tab;
@@ -714,11 +678,8 @@ static RRIP_TABLE rrip_table_getsymname[] = {
 };
 
 int
-cd9660_rrip_getsymname(isodir, outbuf, outlen, imp)
-	struct iso_directory_record *isodir;
-	char *outbuf;
-	u_short *outlen;
-	struct iso_mnt *imp;
+cd9660_rrip_getsymname(struct iso_directory_record *isodir, char *outbuf,
+    u_short *outlen, struct iso_mnt *imp)
 {
 	ISO_RRIP_ANALYZE analyze;
 	
@@ -746,9 +707,7 @@ static RRIP_TABLE rrip_table_extref[] = {
  * Note: We insist on the ER field.
  */
 int
-cd9660_rrip_offset(isodir, imp)
-	struct iso_directory_record *isodir;
-	struct iso_mnt *imp;
+cd9660_rrip_offset(struct iso_directory_record *isodir, struct iso_mnt *imp)
 {
 	ISO_RRIP_OFFSET *p;
 	ISO_RRIP_ANALYZE analyze;
diff --git a/sys/isofs/cd9660/cd9660_util.c b/sys/isofs/cd9660/cd9660_util.c
index 9c56d0dcb65..60c0cc09f7f 100644
--- a/sys/isofs/cd9660/cd9660_util.c
+++ b/sys/isofs/cd9660/cd9660_util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_util.c,v 1.10 2017/12/30 20:47:00 guenther Exp $	*/
+/*	$OpenBSD: cd9660_util.c,v 1.11 2021/03/05 07:01:36 jsg Exp $	*/
 /*	$NetBSD: cd9660_util.c,v 1.12 1997/01/24 00:27:33 cgd Exp $	*/
 
 /*-
@@ -67,11 +67,7 @@ u_char (*cd9660_wchar2char)(u_int32_t wchar) = NULL;
  * Return number of bytes consumed
  */
 int
-isochar(isofn, isoend, joliet_level, c)
-      const u_char *isofn;
-      const u_char *isoend;
-      int joliet_level;
-      u_char *c;
+isochar(const u_char *isofn, const u_char *isoend, int joliet_level, u_char *c)
 {
       *c = *isofn++;
       if (joliet_level == 0 || isofn == isoend)
@@ -101,9 +97,8 @@ isochar(isofn, isoend, joliet_level, c)
  * Note: Version number plus ';' may be omitted.
  */
 int
-isofncmp(fn, fnlen, isofn, isolen, joliet_level)
-	const u_char *fn, *isofn;
-	int fnlen, isolen, joliet_level;
+isofncmp(const u_char *fn, int fnlen, const u_char *isofn, int isolen,
+    int joliet_level)
 {
 	int i, j;
 	u_char c;
@@ -161,13 +156,8 @@ isofncmp(fn, fnlen, isofn, isolen, joliet_level)
  * translate a filename of length > 0
  */
 void
-isofntrans(infn, infnlen, outfn, outfnlen, original, assoc, joliet_level)
-	u_char *infn, *outfn;
-	int infnlen;
-	u_short *outfnlen;
-	int original;
-	int assoc;
-	int joliet_level;
+isofntrans(u_char *infn, int infnlen, u_char *outfn, u_short *outfnlen,
+    int original, int assoc, int joliet_level)
 {
 	int fnidx = 0;
 	u_char c, d = '\0', *infnend = infn + infnlen;
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 9807c39bd2e..78641999f8a 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.93 2019/12/26 13:28:49 bluhm Exp $	*/
+/*	$OpenBSD: cd9660_vfsops.c,v 1.94 2021/03/05 07:01:36 jsg Exp $	*/
 /*	$NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $	*/
 
 /*-
@@ -126,12 +126,8 @@ cd9660_mountroot(void)
  * mount system call
  */
 int
-cd9660_mount(mp, path, data, ndp, p)
-	register struct mount *mp;
-	const char *path;
-	void *data;
-	struct nameidata *ndp;
-	struct proc *p;
+cd9660_mount(struct mount *mp, const char *path, void *data,
+    struct nameidata *ndp, struct proc *p)
 {
 	struct iso_mnt *imp = NULL;
 	struct iso_args *args = data;
@@ -205,11 +201,8 @@ cd9660_mount(mp, path, data, ndp, p)
  * Common code for mount and mountroot
  */
 static int
-iso_mountfs(devvp, mp, p, argp)
-	register struct vnode *devvp;
-	struct mount *mp;
-	struct proc *p;
-	struct iso_args *argp;
+iso_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p,
+    struct iso_args *argp)
 {
 	register struct iso_mnt *isomp = NULL;
 	struct buf *bp = NULL;
@@ -450,10 +443,7 @@ out:
  * Test to see if the device is an ISOFS filesystem.
  */
 int
-iso_disklabelspoof(dev, strat, lp)
-	dev_t dev;
-	void (*strat)(struct buf *);
-	register struct disklabel *lp;
+iso_disklabelspoof(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp)
 {
 	struct buf *bp = NULL;
 	struct iso_volume_descriptor *vdp;
@@ -536,10 +526,7 @@ out:
  */
 /* ARGSUSED */
 int
-cd9660_start(mp, flags, p)
-	struct mount *mp;
-	int flags;
-	struct proc *p;
+cd9660_start(struct mount *mp, int flags, struct proc *p)
 {
 	return (0);
 }
@@ -548,10 +535,7 @@ cd9660_start(mp, flags, p)
  * unmount system call
  */
 int
-cd9660_unmount(mp, mntflags, p)
-	struct mount *mp;
-	int mntflags;
-	struct proc *p;
+cd9660_unmount(struct mount *mp, int mntflags, struct proc *p)
 {
 	register struct iso_mnt *isomp;
 	int error, flags = 0;
@@ -582,9 +566,7 @@ cd9660_unmount(mp, mntflags, p)
  * Return root of a filesystem
  */
 int
-cd9660_root(mp, vpp)
-	struct mount *mp;
-	struct vnode **vpp;
+cd9660_root(struct mount *mp, struct vnode **vpp)
 {
 	struct iso_mnt *imp = VFSTOISOFS(mp);
 	struct iso_directory_record *dp =
@@ -604,12 +586,8 @@ cd9660_root(mp, vpp)
  */
 /* ARGSUSED */
 int
-cd9660_quotactl(mp, cmd, uid, arg, p)
-	struct mount *mp;
-	int cmd;
-	uid_t uid;
-	caddr_t arg;
-	struct proc *p;
+cd9660_quotactl(struct mount *mp, int cmd, uid_t uid, caddr_t arg,
+    struct proc *p)
 {
 
 	return (EOPNOTSUPP);
@@ -619,10 +597,7 @@ cd9660_quotactl(mp, cmd, uid, arg, p)
  * Get file system statistics.
  */
 int
-cd9660_statfs(mp, sbp, p)
-	struct mount *mp;
-	register struct statfs *sbp;
-	struct proc *p;
+cd9660_statfs(struct mount *mp, struct statfs *sbp, struct proc *p)
 {
 	register struct iso_mnt *isomp;
 
@@ -643,12 +618,8 @@ cd9660_statfs(mp, sbp, p)
 
 /* ARGSUSED */
 int
-cd9660_sync(mp, waitfor, stall, cred, p)
-	struct mount *mp;
-	int waitfor;
-	int stall;
-	struct ucred *cred;
-	struct proc *p;
+cd9660_sync(struct mount *mp, int waitfor, int stall, struct ucred *cred,
+    struct proc *p)
 {
 	return (0);
 }
@@ -672,10 +643,7 @@ struct ifid {
 
 /* ARGSUSED */
 int
-cd9660_fhtovp(mp, fhp, vpp)
-	register struct mount *mp;
-	struct fid *fhp;
-	struct vnode **vpp;
+cd9660_fhtovp(struct mount *mp, struct fid *fhp, struct vnode **vpp)
 {
 	struct ifid *ifhp = (struct ifid *)fhp;
 	register struct iso_node *ip;
@@ -702,10 +670,7 @@ cd9660_fhtovp(mp, fhp, vpp)
 }
 
 int
-cd9660_vget(mp, ino, vpp)
-	struct mount *mp;
-	ino_t ino;
-	struct vnode **vpp;
+cd9660_vget(struct mount *mp, ino_t ino, struct vnode **vpp)
 {
 
 	if (ino > (cdino_t)-1)
@@ -728,12 +693,8 @@ cd9660_vget(mp, ino, vpp)
 }
 
 int
-cd9660_vget_internal(mp, ino, vpp, relocated, isodir)
-	struct mount *mp;
-	cdino_t ino;
-	struct vnode **vpp;
-	int relocated;
-	struct iso_directory_record *isodir;
+cd9660_vget_internal(struct mount *mp, cdino_t ino, struct vnode **vpp,
+    int relocated, struct iso_directory_record *isodir)
 {
 	register struct iso_mnt *imp;
 	struct iso_node *ip;
@@ -947,9 +908,7 @@ retry:
  */
 /* ARGSUSED */
 int
-cd9660_vptofh(vp, fhp)
-	struct vnode *vp;
-	struct fid *fhp;
+cd9660_vptofh(struct vnode *vp, struct fid *fhp)
 {
 	register struct iso_node *ip = VTOI(vp);
 	register struct ifid *ifhp;
@@ -972,11 +931,8 @@ cd9660_vptofh(vp, fhp)
  * exflagsp and credanonp.
  */
 int
-cd9660_check_export(mp, nam, exflagsp, credanonp)
-	register struct mount *mp;
-	struct mbuf *nam;
-	int *exflagsp;
-	struct ucred **credanonp;
+cd9660_check_export(struct mount *mp, struct mbuf *nam, int *exflagsp,
+    struct ucred **credanonp)
 {
 	register struct netcred *np;
 	register struct iso_mnt *imp = VFSTOISOFS(mp);
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 0f27cb9c5fb..d5c94d584da 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.86 2020/12/25 12:59:52 visa Exp $	*/
+/*	$OpenBSD: cd9660_vnops.c,v 1.87 2021/03/05 07:01:36 jsg Exp $	*/
 /*	$NetBSD: cd9660_vnops.c,v 1.42 1997/10/16 23:56:57 christos Exp $	*/
 
 /*-
@@ -328,10 +328,7 @@ cd9660_seek(void *v)
 }
 
 int
-iso_uiodir(idp,dp,off)
-	struct isoreaddir *idp;
-	struct dirent *dp;
-	off_t off;
+iso_uiodir(struct isoreaddir *idp, struct dirent *dp, off_t off)
 {
 	int error;
 
@@ -351,8 +348,7 @@ iso_uiodir(idp,dp,off)
 }
 
 int
-iso_shipdir(idp)
-	struct isoreaddir *idp;
+iso_shipdir(struct isoreaddir *idp)
 {
 	struct dirent *dp;
 	int cl, sl, assoc;
diff --git a/sys/isofs/cd9660/iso.h b/sys/isofs/cd9660/iso.h
index 81c844815a7..5b9bd4a2220 100644
--- a/sys/isofs/cd9660/iso.h
+++ b/sys/isofs/cd9660/iso.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iso.h,v 1.15 2013/05/30 17:35:01 guenther Exp $	*/
+/*	$OpenBSD: iso.h,v 1.16 2021/03/05 07:01:36 jsg Exp $	*/
 /*	$NetBSD: iso.h,v 1.20 1997/07/07 22:45:34 cgd Exp $	*/
 
 /*-
@@ -202,8 +202,7 @@ isonum_712(char *p)
 
 /* 7.2.1: unsigned little-endian 16-bit value.  NOT USED IN KERNEL. */
 static __inline int
-isonum_721(p)
-	u_char *p;
+isonum_721(u_char *p)
 {
 #if !defined(__STRICT_ALIGNMENT) && (BYTE_ORDER == LITTLE_ENDIAN)
 	return *(u_int16_t *)p;
@@ -214,8 +213,7 @@ isonum_721(p)
 
 /* 7.2.2: unsigned big-endian 16-bit value.  NOT USED IN KERNEL. */
 static __inline int     
-isonum_722(p)
-	unsigned char *p;
+isonum_722(unsigned char *p)
 {
 #if !defined(__STRICT_ALIGNMENT) && (BYTE_ORDER == BIG_ENDIAN)
 	return *(u_int16_t *)p;
@@ -242,8 +240,7 @@ isonum_723(u_char *p)
 
 /* 7.3.1: unsigned little-endian 32-bit value.  NOT USED IN KERNEL. */
 static __inline int
-isonum_731(p)
-	u_char *p;
+isonum_731(u_char *p)
 {
 #if !defined(__STRICT_ALIGNMENT) && (BYTE_ORDER == LITTLE_ENDIAN)
 	return *(u_int32_t *)p;
@@ -254,8 +251,7 @@ isonum_731(p)
 
 /* 7.3.2: unsigned big-endian 32-bit value.  NOT USED IN KERNEL. */
 static __inline int
-isonum_732(p)
-	unsigned char *p;
+isonum_732(unsigned char *p)
 {
 #if !defined(__STRICT_ALIGNMENT) && (BYTE_ORDER == BIG_ENDIAN)
 	return *(u_int32_t *)p;