Convert to ansi definitions from old-style definitons.

This commit is contained in:
matt 2008-02-27 19:43:36 +00:00
parent a4a1e5ce55
commit 8014191a2e
9 changed files with 94 additions and 208 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_bmap.c,v 1.3 2005/12/11 12:24:25 christos Exp $ */
/* $NetBSD: cd9660_bmap.c,v 1.4 2008/02/27 19:43:36 matt Exp $ */
/*-
* Copyright (c) 1994
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd9660_bmap.c,v 1.3 2005/12/11 12:24:25 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd9660_bmap.c,v 1.4 2008/02/27 19:43:36 matt Exp $");
#include <sys/param.h>
#include <sys/namei.h>
@ -56,8 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: cd9660_bmap.c,v 1.3 2005/12/11 12:24:25 christos Exp
* 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 /* {
struct vnode *a_vp;

View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_extern.h,v 1.22 2007/07/31 21:14:17 pooka Exp $ */
/* $NetBSD: cd9660_extern.h,v 1.23 2008/02/27 19:43:36 matt Exp $ */
/*-
* Copyright (c) 1994
@ -112,7 +112,7 @@ extern int (**cd9660_fifoop_p)(void *);
int isochar(const u_char *, const u_char *, int, u_int16_t *);
int isofncmp(const u_char *, size_t, const u_char *, size_t, int);
void isofntrans(u_char *, int, u_char *, u_short *, int, int, int, int);
void isofntrans(const u_char *, int, u_char *, u_short *, int, int, int, int);
ino_t isodirino(struct iso_directory_record *, struct iso_mnt *);
#endif /* _KERNEL */

View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_lookup.c,v 1.14 2007/11/26 19:01:42 pooka Exp $ */
/* $NetBSD: cd9660_lookup.c,v 1.15 2008/02/27 19:43:36 matt Exp $ */
/*-
* Copyright (c) 1989, 1993, 1994
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.14 2007/11/26 19:01:42 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.15 2008/02/27 19:43:36 matt Exp $");
#include <sys/param.h>
#include <sys/namei.h>
@ -92,8 +92,7 @@ struct nchstats iso_nchstats;
* nor deleting, add name to cache
*/
int
cd9660_lookup(v)
void *v;
cd9660_lookup(void *v)
{
struct vop_lookup_args /* {
struct vnode *a_dvp;

View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_node.c,v 1.22 2008/01/30 09:50:19 ad Exp $ */
/* $NetBSD: cd9660_node.c,v 1.23 2008/02/27 19:43:36 matt Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1994
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.22 2008/01/30 09:50:19 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.23 2008/02/27 19:43:36 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -71,13 +71,13 @@ extern int prtactive; /* 1 => print out reclaim of active vnodes */
struct pool cd9660_node_pool;
static u_int cd9660_chars2ui(u_char *, int);
static u_int cd9660_chars2ui(const u_char *, int);
/*
* Initialize hash links for inodes and dnodes.
*/
void
cd9660_init()
cd9660_init(void)
{
malloc_type_attach(M_ISOFSMNT);
@ -94,7 +94,7 @@ cd9660_init()
*/
void
cd9660_reinit()
cd9660_reinit(void)
{
struct iso_node *ip;
struct ihashhead *oldhash1, *hash1;
@ -124,7 +124,7 @@ cd9660_reinit()
* Destroy node pool and hash table.
*/
void
cd9660_done()
cd9660_done(void)
{
hashdone(isohashtbl, M_ISOFSMNT);
pool_destroy(&cd9660_node_pool);
@ -138,10 +138,7 @@ cd9660_done()
* to it. If it is in core, but locked, wait for it.
*/
struct vnode *
cd9660_ihashget(dev, inum, flags)
dev_t dev;
ino_t inum;
int flags;
cd9660_ihashget(dev_t dev, ino_t inum, int flags)
{
struct iso_node *ip;
struct vnode *vp;
@ -172,8 +169,7 @@ loop:
* ip->i_vnode must be initialized first.
*/
void
cd9660_ihashins(ip)
struct iso_node *ip;
cd9660_ihashins(struct iso_node *ip)
{
struct ihashhead *ipp;
@ -191,8 +187,7 @@ cd9660_ihashins(ip)
* Remove the inode from the hash table.
*/
void
cd9660_ihashrem(ip)
struct iso_node *ip;
cd9660_ihashrem(struct iso_node *ip)
{
mutex_enter(&cd9660_ihash_lock);
LIST_REMOVE(ip, i_hash);
@ -204,8 +199,7 @@ cd9660_ihashrem(ip)
* truncate and deallocate the file.
*/
int
cd9660_inactive(v)
void *v;
cd9660_inactive(void *v)
{
struct vop_inactive_args /* {
struct vnode *a_vp;
@ -229,8 +223,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 /* {
struct vnode *a_vp;
@ -263,10 +256,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;
@ -326,10 +317,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;
@ -366,9 +355,7 @@ cd9660_deftstamp(isodir,inop,bp)
}
int
cd9660_tstamp_conv7(pi,pu)
u_char *pi;
struct timespec *pu;
cd9660_tstamp_conv7(const u_char *pi, struct timespec *pu)
{
int crtime, days;
int y, m, d, hour, minute, second, tz;
@ -409,9 +396,7 @@ cd9660_tstamp_conv7(pi,pu)
}
static u_int
cd9660_chars2ui(begin,len)
u_char *begin;
int len;
cd9660_chars2ui(const u_char *begin, int len)
{
u_int rc;
@ -423,9 +408,7 @@ cd9660_chars2ui(begin,len)
}
int
cd9660_tstamp_conv17(pi,pu)
u_char *pi;
struct timespec *pu;
cd9660_tstamp_conv17(const u_char *pi, struct timespec *pu)
{
u_char tbuf[7];
@ -454,9 +437,7 @@ cd9660_tstamp_conv17(pi,pu)
}
ino_t
isodirino(isodir, imp)
struct iso_directory_record *isodir;
struct iso_mnt *imp;
isodirino(struct iso_directory_record *isodir, struct iso_mnt *imp)
{
ino_t ino;

View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_node.h,v 1.13 2007/12/08 14:41:11 ad Exp $ */
/* $NetBSD: cd9660_node.h,v 1.14 2008/02/27 19:43:36 matt Exp $ */
/*-
* Copyright (c) 1994
@ -131,8 +131,8 @@ void cd9660_deftstamp(struct iso_directory_record *,
struct vnode *cd9660_ihashget(dev_t, ino_t, int);
void 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_tstamp_conv7(const u_char *, struct timespec *);
int cd9660_tstamp_conv17(const u_char *, struct timespec *);
int cd9660_vget_internal(struct mount *, ino_t, struct vnode **, int,
struct iso_directory_record *);

View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_rrip.c,v 1.14 2007/10/08 18:04:02 ad Exp $ */
/* $NetBSD: cd9660_rrip.c,v 1.15 2008/02/27 19:43:36 matt Exp $ */
/*-
* Copyright (c) 1993, 1994
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd9660_rrip.c,v 1.14 2007/10/08 18:04:02 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd9660_rrip.c,v 1.15 2008/02/27 19:43:36 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -85,9 +85,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;
@ -100,9 +98,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;
@ -115,9 +111,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;
ISO_RRIP_SLINK_COMPONENT *pcomp;
@ -228,9 +222,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;
const char *inbuf;
@ -292,9 +284,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;
@ -320,9 +310,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;
@ -346,9 +334,7 @@ cd9660_rrip_reldir(void *v, ISO_RRIP_ANALYZE *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;
@ -404,9 +390,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;
@ -417,9 +401,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;
@ -439,9 +421,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;
@ -457,9 +437,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;
@ -482,9 +460,7 @@ cd9660_rrip_stop(void *v, ISO_RRIP_ANALYZE *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;
@ -506,10 +482,8 @@ cd9660_rrip_extref(v, ana)
static int
cd9660_rrip_loop(isodir, ana, table)
struct iso_directory_record *isodir;
ISO_RRIP_ANALYZE *ana;
const RRIP_TABLE *table;
cd9660_rrip_loop(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana,
const RRIP_TABLE *table)
{
const RRIP_TABLE *ptable;
ISO_SUSP_HEADER *phead;
@ -609,10 +583,8 @@ static const 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;
@ -638,12 +610,8 @@ static const RRIP_TABLE rrip_table_getname[] = {
};
int
cd9660_rrip_getname(isodir, outbuf, outlen, inump, imp)
struct iso_directory_record *isodir;
char *outbuf;
u_short *outlen;
ino_t *inump;
struct iso_mnt *imp;
cd9660_rrip_getname(struct iso_directory_record *isodir, char *outbuf,
u_short *outlen, ino_t *inump, struct iso_mnt *imp)
{
ISO_RRIP_ANALYZE analyze;
const RRIP_TABLE *tab;
@ -682,11 +650,8 @@ static const 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;
@ -713,9 +678,7 @@ static const 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;

View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_util.c,v 1.8 2006/12/08 22:04:56 enami Exp $ */
/* $NetBSD: cd9660_util.c,v 1.9 2008/02/27 19:43:36 matt Exp $ */
/*-
* Copyright (c) 1994
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd9660_util.c,v 1.8 2006/12/08 22:04:56 enami Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd9660_util.c,v 1.9 2008/02/27 19:43:36 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -68,11 +68,8 @@ int cd9660_utf8_joliet = 1;
* Return number of bytes consumed
*/
int
isochar(isofn, isoend, joliet_level, c)
const u_char *isofn;
const u_char *isoend;
int joliet_level;
u_int16_t *c;
isochar(const u_char *isofn, const u_char *isoend, int joliet_level,
u_int16_t *c)
{
*c = isofn[0];
if (joliet_level == 0 || isofn + 1 == isoend) {
@ -98,10 +95,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;
size_t fnlen, isolen;
int joliet_level;
isofncmp(const u_char *fn, size_t fnlen, const u_char *isofn, size_t isolen,
int joliet_level)
{
int i, j;
u_int16_t fc, ic;
@ -168,17 +163,11 @@ isofncmp(fn, fnlen, isofn, isolen, joliet_level)
* translate a filename
*/
void
isofntrans(infn, infnlen, outfn, outfnlen, original, casetrans, assoc, joliet_level)
u_char *infn, *outfn;
int infnlen;
u_short *outfnlen;
int original;
int casetrans;
int assoc;
int joliet_level;
isofntrans(const u_char *infn, int infnlen, u_char *outfn, u_short *outfnlen,
int original, int casetrans, int assoc, int joliet_level)
{
int fnidx = 0;
u_char *infnend = infn + infnlen;
const u_char *infnend = infn + infnlen;
u_int16_t c;
int sz;

View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_vfsops.c,v 1.56 2008/01/30 11:46:59 ad Exp $ */
/* $NetBSD: cd9660_vfsops.c,v 1.57 2008/02/27 19:43:36 matt Exp $ */
/*-
* Copyright (c) 1994
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.56 2008/01/30 11:46:59 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.57 2008/02/27 19:43:36 matt Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@ -130,7 +130,7 @@ static int iso_mountfs(struct vnode *devvp, struct mount *mp,
struct lwp *l, struct iso_args *argp);
int
cd9660_mountroot()
cd9660_mountroot(void)
{
struct mount *mp;
struct lwp *l = curlwp;
@ -166,11 +166,7 @@ cd9660_mountroot()
* mount system call
*/
int
cd9660_mount(mp, path, data, data_len)
struct mount *mp;
const char *path;
void *data;
size_t *data_len;
cd9660_mount(struct mount *mp, const char *path, void *data, size_t *data_len)
{
struct lwp *l = curlwp;
struct nameidata nd;
@ -255,10 +251,7 @@ fail:
* Make a mount point from a volume descriptor
*/
static int
iso_makemp(isomp, bp, ea_len)
struct iso_mnt *isomp;
struct buf *bp;
int *ea_len;
iso_makemp(struct iso_mnt *isomp, struct buf *bp, int *ea_len)
{
struct iso_primary_descriptor *pri;
int logical_block_size;
@ -296,11 +289,8 @@ iso_makemp(isomp, bp, ea_len)
* Common code for mount and mountroot
*/
static int
iso_mountfs(devvp, mp, l, argp)
struct vnode *devvp;
struct mount *mp;
struct lwp *l;
struct iso_args *argp;
iso_mountfs(struct vnode *devvp, struct mount *mp, struct lwp *l,
struct iso_args *argp)
{
struct iso_mnt *isomp = (struct iso_mnt *)0;
struct buf *bp = NULL, *pribp = NULL, *supbp = NULL;
@ -515,9 +505,7 @@ cd9660_start(struct mount *mp, int flags)
* unmount system call
*/
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;
@ -545,9 +533,7 @@ cd9660_unmount(mp, mntflags)
* 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 =
@ -566,9 +552,7 @@ cd9660_root(mp, vpp)
* Get file system statistics.
*/
int
cd9660_statvfs(
struct mount *mp,
struct statvfs *sbp)
cd9660_statvfs(struct mount *mp, struct statvfs *sbp)
{
struct iso_mnt *isomp;
@ -593,12 +577,9 @@ cd9660_statvfs(
/* ARGSUSED */
int
cd9660_sync(
struct mount *mp,
int waitfor,
kauth_cred_t cred)
cd9660_sync(struct mount *mp, int waitfor, kauth_cred_t cred)
{
return (0);
return 0;
}
/*
@ -620,10 +601,7 @@ struct ifid {
/* ARGSUSED */
int
cd9660_fhtovp(mp, fhp, vpp)
struct mount *mp;
struct fid *fhp;
struct vnode **vpp;
cd9660_fhtovp(struct mount *mp, struct fid *fhp, struct vnode **vpp)
{
struct ifid ifh;
struct iso_node *ip;
@ -654,10 +632,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)
{
/*
@ -676,12 +651,8 @@ cd9660_vget(mp, ino, vpp)
}
int
cd9660_vget_internal(mp, ino, vpp, relocated, isodir)
struct mount *mp;
ino_t ino;
struct vnode **vpp;
int relocated;
struct iso_directory_record *isodir;
cd9660_vget_internal(struct mount *mp, ino_t ino, struct vnode **vpp,
int relocated, struct iso_directory_record *isodir)
{
struct iso_mnt *imp;
struct iso_node *ip;
@ -883,10 +854,7 @@ cd9660_vget_internal(mp, ino, vpp, relocated, isodir)
*/
/* ARGSUSED */
int
cd9660_vptofh(vp, fhp, fh_size)
struct vnode *vp;
struct fid *fhp;
size_t *fh_size;
cd9660_vptofh(struct vnode *vp, struct fid *fhp, size_t *fh_size)
{
struct iso_node *ip = VTOI(vp);
struct ifid ifh;

View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_vnops.c,v 1.32 2008/01/25 14:32:12 ad Exp $ */
/* $NetBSD: cd9660_vnops.c,v 1.33 2008/02/27 19:43:36 matt Exp $ */
/*-
* Copyright (c) 1994
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.32 2008/01/25 14:32:12 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.33 2008/02/27 19:43:36 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -90,8 +90,7 @@ int iso_shipdir(struct isoreaddir *);
* super user is granted all permissions.
*/
int
cd9660_access(v)
void *v;
cd9660_access(void *v)
{
struct vop_access_args /* {
struct vnode *a_vp;
@ -122,8 +121,7 @@ cd9660_access(v)
}
int
cd9660_getattr(v)
void *v;
cd9660_getattr(void *v)
{
struct vop_getattr_args /* {
struct vnode *a_vp;
@ -181,8 +179,7 @@ cd9660_getattr(v)
* Vnode op for reading.
*/
int
cd9660_read(v)
void *v;
cd9660_read(void *v)
{
struct vop_read_args /* {
struct vnode *a_vp;
@ -265,10 +262,7 @@ out:
}
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;
@ -297,8 +291,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;
@ -354,8 +347,7 @@ iso_shipdir(idp)
* Vnode op for readdir
*/
int
cd9660_readdir(v)
void *v;
cd9660_readdir(void *v)
{
struct vop_readdir_args /* {
struct vnode *a_vp;
@ -558,9 +550,9 @@ cd9660_readdir(v)
typedef struct iso_directory_record ISODIR;
typedef struct iso_node ISONODE;
typedef struct iso_mnt ISOMNT;
int
cd9660_readlink(v)
void *v;
cd9660_readlink(void *v)
{
struct vop_readlink_args /* {
struct vnode *a_vp;
@ -653,8 +645,7 @@ cd9660_readlink(v)
}
int
cd9660_link(v)
void *v;
cd9660_link(void *v)
{
struct vop_link_args /* {
struct vnode *a_dvp;
@ -668,8 +659,7 @@ cd9660_link(v)
}
int
cd9660_symlink(v)
void *v;
cd9660_symlink(void *v)
{
struct vop_symlink_args /* {
struct vnode *a_dvp;
@ -689,8 +679,7 @@ cd9660_symlink(v)
* then call the device strategy routine.
*/
int
cd9660_strategy(v)
void *v;
cd9660_strategy(void *v)
{
struct vop_strategy_args /* {
struct vnode *a_vp;
@ -738,8 +727,7 @@ cd9660_print(void *v)
* Return POSIX pathconf information applicable to cd9660 filesystems.
*/
int
cd9660_pathconf(v)
void *v;
cd9660_pathconf(void *v)
{
struct vop_pathconf_args /* {
struct vnode *a_vp;
@ -784,8 +772,7 @@ cd9660_pathconf(v)
* Allow changing the size for special files (and fifos).
*/
int
cd9660_setattr(v)
void *v;
cd9660_setattr(void *v)
{
struct vop_setattr_args /* {
struct vnodeop_desc *a_desc;