The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a5f59e8565d097309559a7079b4a79b30f6ece79
commit a5f59e8565d097309559a7079b4a79b30f6ece79 Author: Ed Maste <[email protected]> AuthorDate: 2022-07-17 12:14:49 +0000 Commit: Ed Maste <[email protected]> CommitDate: 2022-07-17 12:14:49 +0000 cd9660: Use ANSI (c89) prototypes Sponsored by: The FreeBSD Foundation --- sys/fs/cd9660/cd9660_bmap.c | 10 +---- sys/fs/cd9660/cd9660_lookup.c | 13 +----- sys/fs/cd9660/cd9660_node.c | 41 +++++-------------- sys/fs/cd9660/cd9660_rrip.c | 88 +++++++++++----------------------------- sys/fs/cd9660/cd9660_util.c | 41 ++++--------------- sys/fs/cd9660/cd9660_vfsops.c | 42 +++++-------------- sys/fs/cd9660/cd9660_vnops.c | 94 ++++++------------------------------------- 7 files changed, 67 insertions(+), 262 deletions(-) diff --git a/sys/fs/cd9660/cd9660_bmap.c b/sys/fs/cd9660/cd9660_bmap.c index 671482b7c767..f88c71cf7cac 100644 --- a/sys/fs/cd9660/cd9660_bmap.c +++ b/sys/fs/cd9660/cd9660_bmap.c @@ -54,15 +54,7 @@ __FBSDID("$FreeBSD$"); * file. */ int -cd9660_bmap(ap) - struct vop_bmap_args /* { - struct vnode *a_vp; - daddr_t a_bn; - struct bufobj **a_bop; - daddr_t *a_bnp; - int *a_runp; - int *a_runb; - } */ *ap; +cd9660_bmap(struct vop_bmap_args *ap) { struct iso_node *ip = VTOI(ap->a_vp); daddr_t lblkno = ap->a_bn; diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c index deb2453636f1..4524f75f90ea 100644 --- a/sys/fs/cd9660/cd9660_lookup.c +++ b/sys/fs/cd9660/cd9660_lookup.c @@ -102,12 +102,7 @@ cd9660_ino_alloc(struct mount *mp, void *arg, int lkflags, * NOTE: (LOOKUP | LOCKPARENT) currently returns the parent inode unlocked. */ int -cd9660_lookup(ap) - struct vop_cachedlookup_args /* { - struct vnode *a_dvp; - struct vnode **a_vpp; - struct componentname *a_cnp; - } */ *ap; +cd9660_lookup(struct vop_cachedlookup_args *ap) { struct vnode *vdp; /* vnode for directory being searched */ struct iso_node *dp; /* inode for directory being searched */ @@ -434,11 +429,7 @@ found: * remaining space in the directory. */ int -cd9660_blkatoff(vp, offset, res, bpp) - struct vnode *vp; - off_t offset; - char **res; - struct buf **bpp; +cd9660_blkatoff(struct vnode *vp, off_t offset, char **res, struct buf **bpp) { struct iso_node *ip; struct iso_mnt *imp; diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c index cc45ac161040..cbda19cd2020 100644 --- a/sys/fs/cd9660/cd9660_node.c +++ b/sys/fs/cd9660/cd9660_node.c @@ -60,10 +60,7 @@ static unsigned cd9660_chars2ui(unsigned char *begin, int len); * truncate and deallocate the file. */ int -cd9660_inactive(ap) - struct vop_inactive_args /* { - struct vnode *a_vp; - } */ *ap; +cd9660_inactive(struct vop_inactive_args *ap) { struct vnode *vp = ap->a_vp; struct iso_node *ip = VTOI(vp); @@ -82,10 +79,7 @@ cd9660_inactive(ap) * Reclaim an inode so that it can be used for other purposes. */ int -cd9660_reclaim(ap) - struct vop_reclaim_args /* { - struct vnode *a_vp; - } */ *ap; +cd9660_reclaim(struct vop_reclaim_args *ap) { struct vnode *vp = ap->a_vp; @@ -106,11 +100,8 @@ cd9660_reclaim(ap) * File attributes */ void -cd9660_defattr(isodir, inop, bp, ftype) - struct iso_directory_record *isodir; - struct iso_node *inop; - struct buf *bp; - enum ISO_FTYPE ftype; +cd9660_defattr(struct iso_directory_record *isodir, struct iso_node *inop, + struct buf *bp, enum ISO_FTYPE ftype) { struct buf *bp2 = NULL; struct iso_mnt *imp; @@ -171,11 +162,8 @@ cd9660_defattr(isodir, inop, bp, ftype) * Time stamps */ void -cd9660_deftstamp(isodir,inop,bp,ftype) - struct iso_directory_record *isodir; - struct iso_node *inop; - struct buf *bp; - enum ISO_FTYPE ftype; +cd9660_deftstamp(struct iso_directory_record *isodir, struct iso_node *inop, + struct buf *bp, enum ISO_FTYPE ftype) { struct buf *bp2 = NULL; struct iso_mnt *imp; @@ -213,10 +201,7 @@ cd9660_deftstamp(isodir,inop,bp,ftype) } int -cd9660_tstamp_conv7(pi,pu,ftype) - u_char *pi; - struct timespec *pu; - enum ISO_FTYPE ftype; +cd9660_tstamp_conv7(u_char *pi, struct timespec *pu, enum ISO_FTYPE ftype) { int crtime, days; int y, m, d, hour, minute, second, tz; @@ -261,9 +246,7 @@ cd9660_tstamp_conv7(pi,pu,ftype) } static u_int -cd9660_chars2ui(begin,len) - u_char *begin; - int len; +cd9660_chars2ui(u_char *begin, int len) { u_int rc; @@ -275,9 +258,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]; @@ -306,9 +287,7 @@ cd9660_tstamp_conv17(pi,pu) } cd_ino_t -isodirino(isodir, imp) - struct iso_directory_record *isodir; - struct iso_mnt *imp; +isodirino(struct iso_directory_record *isodir, struct iso_mnt *imp) { cd_ino_t ino; diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c index 87bc64c9b7d2..26a09f9be383 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -86,9 +86,7 @@ static int cd9660_rrip_tstamp(ISO_RRIP_TSTAMP *p, ISO_RRIP_ANALYZE *ana); * POSIX file attribute */ static int -cd9660_rrip_attr(p,ana) - ISO_RRIP_ATTR *p; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_attr(ISO_RRIP_ATTR *p, ISO_RRIP_ANALYZE *ana) { ana->inop->inode.iso_mode = isonum_733(p->mode); ana->inop->inode.iso_uid = isonum_733(p->uid); @@ -99,9 +97,7 @@ cd9660_rrip_attr(p,ana) } static void -cd9660_rrip_defattr(isodir,ana) - struct iso_directory_record *isodir; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_defattr(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana) { /* But this is a required field! */ printf("RRIP without PX field?\n"); @@ -112,9 +108,7 @@ cd9660_rrip_defattr(isodir,ana) * Symbolic Links */ static int -cd9660_rrip_slink(p,ana) - ISO_RRIP_SLINK *p; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_slink(ISO_RRIP_SLINK *p, ISO_RRIP_ANALYZE *ana) { ISO_RRIP_SLINK_COMPONENT *pcomp; ISO_RRIP_SLINK_COMPONENT *pcompe; @@ -221,9 +215,7 @@ cd9660_rrip_slink(p,ana) * Alternate name */ static int -cd9660_rrip_altname(p,ana) - ISO_RRIP_ALTNAME *p; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_altname(ISO_RRIP_ALTNAME *p, ISO_RRIP_ANALYZE *ana) { char *inbuf; int wlen; @@ -286,9 +278,7 @@ cd9660_rrip_altname(p,ana) } static void -cd9660_rrip_defname(isodir,ana) - struct iso_directory_record *isodir; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_defname(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana) { isofntrans(isodir->name,isonum_711(isodir->name_len), ana->outbuf,ana->outlen, @@ -311,9 +301,7 @@ cd9660_rrip_defname(isodir,ana) * Parent or Child Link */ static int -cd9660_rrip_pclink(p,ana) - ISO_RRIP_CLINK *p; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_pclink(ISO_RRIP_CLINK *p, ISO_RRIP_ANALYZE *ana) { *ana->inump = isonum_733(p->dir_loc) << ana->imp->im_bshift; ana->fields &= ~(ISO_SUSP_CLINK|ISO_SUSP_PLINK); @@ -324,9 +312,7 @@ cd9660_rrip_pclink(p,ana) * Relocated directory */ static int -cd9660_rrip_reldir(p,ana) - ISO_RRIP_RELDIR *p; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_reldir(ISO_RRIP_RELDIR *p, ISO_RRIP_ANALYZE *ana) { /* special hack to make caller aware of RE field */ *ana->outlen = 0; @@ -335,9 +321,7 @@ cd9660_rrip_reldir(p,ana) } static int -cd9660_rrip_tstamp(p,ana) - ISO_RRIP_TSTAMP *p; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_tstamp(ISO_RRIP_TSTAMP *p, ISO_RRIP_ANALYZE *ana) { u_char *ptime; @@ -394,9 +378,8 @@ cd9660_rrip_tstamp(p,ana) } static void -cd9660_rrip_deftstamp(isodir,ana) - struct iso_directory_record *isodir; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_deftstamp(struct iso_directory_record *isodir, + ISO_RRIP_ANALYZE *ana) { cd9660_deftstamp(isodir,ana->inop,NULL,ISO_FTYPE_RRIP); } @@ -405,9 +388,7 @@ cd9660_rrip_deftstamp(isodir,ana) * POSIX device modes */ static int -cd9660_rrip_device(p,ana) - ISO_RRIP_DEVICE *p; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_device(ISO_RRIP_DEVICE *p, ISO_RRIP_ANALYZE *ana) { u_int high, low; @@ -426,9 +407,7 @@ cd9660_rrip_device(p,ana) * Flag indicating */ static int -cd9660_rrip_idflag(p,ana) - ISO_RRIP_IDFLAG *p; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_idflag(ISO_RRIP_IDFLAG *p, ISO_RRIP_ANALYZE *ana) { ana->fields &= isonum_711(p->flags)|~0xff; /* don't touch high bits */ /* special handling of RE field */ @@ -442,9 +421,7 @@ cd9660_rrip_idflag(p,ana) * Continuation pointer */ static int -cd9660_rrip_cont(p,ana) - ISO_RRIP_CONT *p; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_cont(ISO_RRIP_CONT *p, ISO_RRIP_ANALYZE *ana) { ana->iso_ce_blk = isonum_733(p->location); ana->iso_ce_off = isonum_733(p->offset); @@ -456,9 +433,7 @@ cd9660_rrip_cont(p,ana) * System Use end */ static int -cd9660_rrip_stop(p,ana) - ISO_SUSP_HEADER *p; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_stop(ISO_SUSP_HEADER *p, ISO_RRIP_ANALYZE *ana) { return ISO_SUSP_STOP; } @@ -467,9 +442,7 @@ cd9660_rrip_stop(p,ana) * Extension reference */ static int -cd9660_rrip_extref(p,ana) - ISO_RRIP_EXTREF *p; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_extref(ISO_RRIP_EXTREF *p, ISO_RRIP_ANALYZE *ana) { if ( ! ((isonum_711(p->len_id) == 10 && bcmp((char *)p + 8,"RRIP_1991A",10) == 0) @@ -484,10 +457,8 @@ cd9660_rrip_extref(p,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) { RRIP_TABLE *ptable; ISO_SUSP_HEADER *phead; @@ -593,10 +564,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; @@ -622,12 +591,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; - cd_ino_t *inump; - struct iso_mnt *imp; +cd9660_rrip_getname(struct iso_directory_record *isodir, char *outbuf, + u_short *outlen, cd_ino_t *inump, struct iso_mnt *imp) { ISO_RRIP_ANALYZE analyze; RRIP_TABLE *tab; @@ -666,11 +631,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; @@ -697,9 +659,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/fs/cd9660/cd9660_util.c b/sys/fs/cd9660/cd9660_util.c index db2463c0de54..57fa3af8ddea 100644 --- a/sys/fs/cd9660/cd9660_util.c +++ b/sys/fs/cd9660/cd9660_util.c @@ -57,14 +57,8 @@ extern struct iconv_functions *cd9660_iconv; * Return number of bytes consumed */ int -isochar(isofn, isoend, joliet_level, c, clen, flags, handle) - u_char *isofn; - u_char *isoend; - int joliet_level; - u_short *c; - int *clen; - int flags; - void *handle; +isochar(u_char *isofn, u_char *isoend, int joliet_level, u_short *c, int *clen, + int flags, void *handle) { size_t i, j, len; char inbuf[3], outbuf[3], *inp, *outp; @@ -109,15 +103,8 @@ isochar(isofn, isoend, joliet_level, c, clen, flags, handle) * Note: Version number plus ';' may be omitted. */ int -isofncmp(fn, fnlen, isofn, isolen, joliet_level, flags, handle, lhandle) - u_char *fn; - int fnlen; - u_char *isofn; - int isolen; - int joliet_level; - int flags; - void *handle; - void *lhandle; +isofncmp(u_char *fn, int fnlen, u_char *isofn, int isolen, int joliet_level, + int flags, void *handle, void *lhandle) { int i, j; u_short c, d; @@ -179,16 +166,8 @@ isofncmp(fn, fnlen, isofn, isolen, joliet_level, flags, handle, lhandle) * translate a filename of length > 0 */ void -isofntrans(infn, infnlen, outfn, outfnlen, original, assoc, joliet_level, flags, handle) - u_char *infn; - int infnlen; - u_char *outfn; - u_short *outfnlen; - int original; - int assoc; - int joliet_level; - int flags; - void *handle; +isofntrans(u_char *infn, int infnlen, u_char *outfn, u_short *outfnlen, + int original, int assoc, int joliet_level, int flags, void *handle) { u_short c, d = '\0'; u_char *outp = outfn, *infnend = infn + infnlen; @@ -217,12 +196,8 @@ isofntrans(infn, infnlen, outfn, outfnlen, original, assoc, joliet_level, flags, * same as sgetrune(3) */ u_short -sgetrune(string, n, result, flags, handle) - const char *string; - size_t n; - char const **result; - int flags; - void *handle; +sgetrune(const char *string, size_t n, char const **result, int flags, + void *handle) { size_t i, j, len; char outbuf[3], *outp; diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index 30bc8ba6b9c8..cc0fd0b2f941 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -202,9 +202,7 @@ cd9660_mount(struct mount *mp) * Common code for mount and mountroot */ static int -iso_mountfs(devvp, mp) - struct vnode *devvp; - struct mount *mp; +iso_mountfs(struct vnode *devvp, struct mount *mp) { struct iso_mnt *isomp = NULL; struct buf *bp = NULL; @@ -500,9 +498,7 @@ out: * unmount system call */ static int -cd9660_unmount(mp, mntflags) - struct mount *mp; - int mntflags; +cd9660_unmount(struct mount *mp, int mntflags) { struct iso_mnt *isomp; int error, flags = 0; @@ -537,10 +533,7 @@ cd9660_unmount(mp, mntflags) * Return root of a filesystem */ static int -cd9660_root(mp, flags, vpp) - struct mount *mp; - int flags; - struct vnode **vpp; +cd9660_root(struct mount *mp, int flags, struct vnode **vpp) { struct iso_mnt *imp = VFSTOISOFS(mp); struct iso_directory_record *dp = @@ -559,9 +552,7 @@ cd9660_root(mp, flags, vpp) * Get filesystem statistics. */ static int -cd9660_statfs(mp, sbp) - struct mount *mp; - struct statfs *sbp; +cd9660_statfs(struct mount *mp, struct statfs *sbp) { struct iso_mnt *isomp; @@ -589,11 +580,7 @@ cd9660_statfs(mp, sbp) /* ARGSUSED */ static int -cd9660_fhtovp(mp, fhp, flags, vpp) - struct mount *mp; - struct fid *fhp; - int flags; - struct vnode **vpp; +cd9660_fhtovp(struct mount *mp, struct fid *fhp, int flags, struct vnode **vpp) { struct ifid ifh; struct iso_node *ip; @@ -628,11 +615,7 @@ cd9660_fhtovp(mp, fhp, flags, vpp) * needed for anything other than nfsd, and who exports a mounted DVD over NFS? */ static int -cd9660_vget(mp, ino, flags, vpp) - struct mount *mp; - ino_t ino; - int flags; - struct vnode **vpp; +cd9660_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp) { /* @@ -652,9 +635,7 @@ cd9660_vget(mp, ino, flags, vpp) /* Use special comparator for full 64-bit ino comparison. */ static int -cd9660_vfs_hash_cmp(vp, pino) - struct vnode *vp; - void *pino; +cd9660_vfs_hash_cmp(struct vnode *vp, void *pino) { struct iso_node *ip; cd_ino_t ino; @@ -665,13 +646,8 @@ cd9660_vfs_hash_cmp(vp, pino) } int -cd9660_vget_internal(mp, ino, flags, vpp, relocated, isodir) - struct mount *mp; - cd_ino_t ino; - int flags; - struct vnode **vpp; - int relocated; - struct iso_directory_record *isodir; +cd9660_vget_internal(struct mount *mp, cd_ino_t ino, int flags, + struct vnode **vpp, int relocated, struct iso_directory_record *isodir) { struct iso_mnt *imp; struct iso_node *ip; diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index f75b0a29900a..96d09055f5be 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -83,13 +83,7 @@ static vop_getpages_t cd9660_getpages; * Setattr call. Only allowed for block and character special devices. */ static int -cd9660_setattr(ap) - struct vop_setattr_args /* { - struct vnodeop_desc *a_desc; - struct vnode *a_vp; - struct vattr *a_vap; - struct ucred *a_cred; - } */ *ap; +cd9660_setattr(struct vop_setattr_args *ap) { struct vnode *vp = ap->a_vp; struct vattr *vap = ap->a_vap; @@ -125,13 +119,7 @@ cd9660_setattr(ap) */ /* ARGSUSED */ static int -cd9660_access(ap) - struct vop_access_args /* { - struct vnode *a_vp; - accmode_t a_accmode; - struct ucred *a_cred; - struct thread *a_td; - } */ *ap; +cd9660_access(struct vop_access_args *ap) { struct vnode *vp = ap->a_vp; struct iso_node *ip = VTOI(vp); @@ -162,14 +150,7 @@ cd9660_access(ap) } static int -cd9660_open(ap) - struct vop_open_args /* { - struct vnode *a_vp; - int a_mode; - struct ucred *a_cred; - struct thread *a_td; - struct file *a_fp; - } */ *ap; +cd9660_open(struct vop_open_args *ap) { struct vnode *vp = ap->a_vp; struct iso_node *ip = VTOI(vp); @@ -182,12 +163,7 @@ cd9660_open(ap) } static int -cd9660_getattr(ap) - struct vop_getattr_args /* { - struct vnode *a_vp; - struct vattr *a_vap; - struct ucred *a_cred; - } */ *ap; +cd9660_getattr(struct vop_getattr_args *ap) { struct vnode *vp = ap->a_vp; @@ -243,15 +219,7 @@ cd9660_getattr(ap) * Vnode op for ioctl. */ static int -cd9660_ioctl(ap) - struct vop_ioctl_args /* { - struct vnode *a_vp; - u_long a_command; - caddr_t a_data; - int a_fflag; - struct ucred *a_cred; - struct thread *a_td; - } */ *ap; +cd9660_ioctl(struct vop_ioctl_args *ap) { struct vnode *vp; struct iso_node *ip; @@ -288,13 +256,7 @@ cd9660_ioctl(ap) * Vnode op for reading. */ static int -cd9660_read(ap) - struct vop_read_args /* { - struct vnode *a_vp; - struct uio *a_uio; - int a_ioflag; - struct ucred *a_cred; - } */ *ap; +cd9660_read(struct vop_read_args *ap) { struct vnode *vp = ap->a_vp; struct uio *uio = ap->a_uio; @@ -372,10 +334,7 @@ struct isoreaddir { }; static 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; @@ -404,8 +363,7 @@ iso_uiodir(idp,dp,off) } static int -iso_shipdir(idp) - struct isoreaddir *idp; +iso_shipdir(struct isoreaddir *idp) { struct dirent *dp; int cl, sl, assoc; @@ -457,15 +415,7 @@ iso_shipdir(idp) * Vnode op for readdir */ static int -cd9660_readdir(ap) - struct vop_readdir_args /* { - struct vnode *a_vp; - struct uio *a_uio; - struct ucred *a_cred; - int *a_eofflag; - int *a_ncookies; - uint64_t **a_cookies; - } */ *ap; +cd9660_readdir(struct vop_readdir_args *ap) { struct uio *uio = ap->a_uio; struct isoreaddir *idp; @@ -656,12 +606,7 @@ typedef struct iso_directory_record ISODIR; typedef struct iso_node ISONODE; typedef struct iso_mnt ISOMNT; static int -cd9660_readlink(ap) - struct vop_readlink_args /* { - struct vnode *a_vp; - struct uio *a_uio; - struct ucred *a_cred; - } */ *ap; +cd9660_readlink(struct vop_readlink_args *ap) { ISONODE *ip; ISODIR *dirp; @@ -747,11 +692,7 @@ cd9660_readlink(ap) * then call the device strategy routine. */ static int -cd9660_strategy(ap) - struct vop_strategy_args /* { - struct buf *a_vp; - struct buf *a_bp; - } */ *ap; +cd9660_strategy(struct vop_strategy_args *ap) { struct buf *bp = ap->a_bp; struct vnode *vp = ap->a_vp; @@ -775,12 +716,7 @@ cd9660_strategy(ap) * Return POSIX pathconf information applicable to cd9660 filesystems. */ static int -cd9660_pathconf(ap) - struct vop_pathconf_args /* { - struct vnode *a_vp; - int a_name; - register_t *a_retval; - } */ *ap; +cd9660_pathconf(struct vop_pathconf_args *ap) { switch (ap->a_name) { @@ -815,11 +751,7 @@ cd9660_pathconf(ap) * Vnode pointer to File handle */ static int -cd9660_vptofh(ap) - struct vop_vptofh_args /* { - struct vnode *a_vp; - struct fid *a_fhp; - } */ *ap; +cd9660_vptofh(struct vop_vptofh_args *ap) { struct ifid ifh; struct iso_node *ip = VTOI(ap->a_vp);
