Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/compat/netbsd32/netbsd32_fs.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/compat/netbsd32/netbsd32_fs.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.46.10.2 retrieving revision 1.47 diff -u -p -r1.46.10.2 -r1.47 --- src/sys/compat/netbsd32/netbsd32_fs.c 2007/12/26 21:39:06 1.46.10.2 +++ src/sys/compat/netbsd32/netbsd32_fs.c 2007/12/04 18:40:20 1.47 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_fs.c,v 1.46.10.2 2007/12/26 21:39:06 ad Exp $ */ +/* $NetBSD: netbsd32_fs.c,v 1.47 2007/12/04 18:40:20 dsl Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_fs.c,v 1.46.10.2 2007/12/26 21:39:06 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_fs.c,v 1.47 2007/12/04 18:40:20 dsl Exp $"); #include #include @@ -101,13 +101,16 @@ netbsd32_get_iov(struct netbsd32_iovec * } int -netbsd32_readv(struct lwp *l, const struct netbsd32_readv_args *uap, register_t *retval) +netbsd32_readv(l, v, retval) + struct lwp *l; + void *v; + register_t *retval; { - /* { + struct netbsd32_readv_args /* { syscallarg(int) fd; syscallarg(const netbsd32_iovecp_t) iovp; syscallarg(int) iovcnt; - } */ + } */ *uap = v; int fd = SCARG(uap, fd); struct proc *p = l->l_proc; struct file *fp; @@ -128,7 +131,15 @@ netbsd32_readv(struct lwp *l, const stru /* Damn thing copies in the iovec! */ int -dofilereadv32(struct lwp *l, int fd, struct file *fp, struct netbsd32_iovec *iovp, int iovcnt, off_t *offset, int flags, register_t *retval) +dofilereadv32(l, fd, fp, iovp, iovcnt, offset, flags, retval) + struct lwp *l; + int fd; + struct file *fp; + struct netbsd32_iovec *iovp; + int iovcnt; + off_t *offset; + int flags; + register_t *retval; { struct uio auio; struct iovec *iov; @@ -208,13 +219,16 @@ out: } int -netbsd32_writev(struct lwp *l, const struct netbsd32_writev_args *uap, register_t *retval) +netbsd32_writev(l, v, retval) + struct lwp *l; + void *v; + register_t *retval; { - /* { + struct netbsd32_writev_args /* { syscallarg(int) fd; syscallarg(const netbsd32_iovecp_t) iovp; syscallarg(int) iovcnt; - } */ + } */ *uap = v; int fd = SCARG(uap, fd); struct file *fp; struct proc *p = l->l_proc; @@ -234,7 +248,15 @@ netbsd32_writev(struct lwp *l, const str } int -dofilewritev32(struct lwp *l, int fd, struct file *fp, struct netbsd32_iovec *iovp, int iovcnt, off_t *offset, int flags, register_t *retval) +dofilewritev32(l, fd, fp, iovp, iovcnt, offset, flags, retval) + struct lwp *l; + int fd; + struct file *fp; + struct netbsd32_iovec *iovp; + int iovcnt; + off_t *offset; + int flags; + register_t *retval; { struct uio auio; struct iovec *iov; @@ -344,12 +366,15 @@ get_utimes32(const netbsd32_timevalp_t * } int -netbsd32_utimes(struct lwp *l, const struct netbsd32_utimes_args *uap, register_t *retval) +netbsd32_utimes(l, v, retval) + struct lwp *l; + void *v; + register_t *retval; { - /* { + struct netbsd32_utimes_args /* { syscallarg(const netbsd32_charp) path; syscallarg(const netbsd32_timevalp_t) tptr; - } */ + } */ *uap = v; int error; struct timeval tv[2], *tvp; @@ -376,13 +401,16 @@ netbds32_copyout_statvfs(const void *kp, } int -netbsd32_statvfs1(struct lwp *l, const struct netbsd32_statvfs1_args *uap, register_t *retval) +netbsd32_statvfs1(l, v, retval) + struct lwp *l; + void *v; + register_t *retval; { - /* { + struct netbsd32_statvfs1_args /* { syscallarg(const netbsd32_charp) path; syscallarg(netbsd32_statvfsp_t) buf; syscallarg(int) flags; - } */ + } */ *uap = v; struct statvfs *sb; int error; @@ -395,13 +423,16 @@ netbsd32_statvfs1(struct lwp *l, const s } int -netbsd32_fstatvfs1(struct lwp *l, const struct netbsd32_fstatvfs1_args *uap, register_t *retval) +netbsd32_fstatvfs1(l, v, retval) + struct lwp *l; + void *v; + register_t *retval; { - /* { + struct netbsd32_fstatvfs1_args /* { syscallarg(int) fd; syscallarg(netbsd32_statvfsp_t) buf; syscallarg(int) flags; - } */ + } */ *uap = v; struct statvfs *sb; int error; @@ -414,13 +445,16 @@ netbsd32_fstatvfs1(struct lwp *l, const } int -netbsd32_getvfsstat(struct lwp *l, const struct netbsd32_getvfsstat_args *uap, register_t *retval) +netbsd32_getvfsstat(l, v, retval) + struct lwp *l; + void *v; + register_t *retval; { - /* { + struct netbsd32_getvfsstat_args /* { syscallarg(netbsd32_statvfsp_t) buf; syscallarg(netbsd32_size_t) bufsize; syscallarg(int) flags; - } */ + } */ *uap = v; return do_sys_getvfsstat(l, SCARG_P32(uap, buf), SCARG(uap, bufsize), SCARG(uap, flags), netbds32_copyout_statvfs, @@ -428,14 +462,17 @@ netbsd32_getvfsstat(struct lwp *l, const } int -netbsd32___fhstatvfs140(struct lwp *l, const struct netbsd32___fhstatvfs140_args *uap, register_t *retval) +netbsd32___fhstatvfs140(l, v, retval) + struct lwp *l; + void *v; + register_t *retval; { - /* { + struct netbsd32___fhstatvfs140_args /* { syscallarg(const netbsd32_pointer_t) fhp; syscallarg(netbsd32_size_t) fh_size; syscallarg(netbsd32_statvfsp_t) buf; syscallarg(int) flags; - } */ + } */ *uap = v; struct statvfs *sb; int error; @@ -451,12 +488,15 @@ netbsd32___fhstatvfs140(struct lwp *l, c } int -netbsd32_futimes(struct lwp *l, const struct netbsd32_futimes_args *uap, register_t *retval) +netbsd32_futimes(l, v, retval) + struct lwp *l; + void *v; + register_t *retval; { - /* { + struct netbsd32_futimes_args /* { syscallarg(int) fd; syscallarg(const netbsd32_timevalp_t) tptr; - } */ + } */ *uap = v; int error; struct file *fp; struct timeval tv[2], *tvp; @@ -476,13 +516,16 @@ netbsd32_futimes(struct lwp *l, const st } int -netbsd32_sys___getdents30(struct lwp *l, const struct netbsd32_sys___getdents30_args *uap, register_t *retval) +netbsd32_sys___getdents30(l, v, retval) + struct lwp *l; + void *v; + register_t *retval; { - /* { + struct netbsd32_sys___getdents30_args /* { syscallarg(int) fd; syscallarg(netbsd32_charp) buf; syscallarg(netbsd32_size_t) count; - } */ + } */ *uap = v; struct file *fp; int error, done; struct proc *p = l->l_proc; @@ -503,12 +546,15 @@ netbsd32_sys___getdents30(struct lwp *l, } int -netbsd32_lutimes(struct lwp *l, const struct netbsd32_lutimes_args *uap, register_t *retval) +netbsd32_lutimes(l, v, retval) + struct lwp *l; + void *v; + register_t *retval; { - /* { + struct netbsd32_lutimes_args /* { syscallarg(const netbsd32_charp) path; syscallarg(const netbsd32_timevalp_t) tptr; - } */ + } */ *uap = v; int error; struct timeval tv[2], *tvp; @@ -521,12 +567,15 @@ netbsd32_lutimes(struct lwp *l, const st } int -netbsd32_sys___stat30(struct lwp *l, const struct netbsd32_sys___stat30_args *uap, register_t *retval) +netbsd32_sys___stat30(l, v, retval) + struct lwp *l; + void *v; + register_t *retval; { - /* { + struct netbsd32_sys___stat30_args /* { syscallarg(const netbsd32_charp) path; syscallarg(netbsd32_statp_t) ub; - } */ + } */ *uap = v; struct netbsd32_stat sb32; struct stat sb; int error; @@ -543,12 +592,15 @@ netbsd32_sys___stat30(struct lwp *l, con } int -netbsd32_sys___fstat30(struct lwp *l, const struct netbsd32_sys___fstat30_args *uap, register_t *retval) +netbsd32_sys___fstat30(l, v, retval) + struct lwp *l; + void *v; + register_t *retval; { - /* { + struct netbsd32_sys___fstat30_args /* { syscallarg(int) fd; syscallarg(netbsd32_statp_t) sb; - } */ + } */ *uap = v; int fd = SCARG(uap, fd); struct proc *p = l->l_proc; struct filedesc *fdp = p->p_fd; @@ -572,12 +624,15 @@ netbsd32_sys___fstat30(struct lwp *l, co } int -netbsd32_sys___lstat30(struct lwp *l, const struct netbsd32_sys___lstat30_args *uap, register_t *retval) +netbsd32_sys___lstat30(l, v, retval) + struct lwp *l; + void *v; + register_t *retval; { - /* { + struct netbsd32_sys___lstat30_args /* { syscallarg(const netbsd32_charp) path; syscallarg(netbsd32_statp_t) ub; - } */ + } */ *uap = v; struct netbsd32_stat sb32; struct stat sb; int error; @@ -593,14 +648,16 @@ netbsd32_sys___lstat30(struct lwp *l, co return (error); } -int -netbsd32___fhstat40(struct lwp *l, const struct netbsd32___fhstat40_args *uap, register_t *retval) +int netbsd32___fhstat40(l, v, retval) + struct lwp *l; + void *v; + register_t *retval; { - /* { + struct netbsd32___fhstat40_args /* { syscallarg(const netbsd32_pointer_t) fhp; syscallarg(netbsd32_size_t) fh_size; syscallarg(netbsd32_statp_t) sb; - } */ + } */ *uap = v; struct stat sb; struct netbsd32_stat sb32; int error; @@ -614,15 +671,18 @@ netbsd32___fhstat40(struct lwp *l, const } int -netbsd32_preadv(struct lwp *l, const struct netbsd32_preadv_args *uap, register_t *retval) +netbsd32_preadv(l, v, retval) + struct lwp *l; + void *v; + register_t *retval; { - /* { + struct netbsd32_preadv_args /* { syscallarg(int) fd; syscallarg(const netbsd32_iovecp_t) iovp; syscallarg(int) iovcnt; syscallarg(int) pad; syscallarg(off_t) offset; - } */ + } */ *uap = v; struct proc *p = l->l_proc; struct filedesc *fdp = p->p_fd; struct file *fp; @@ -662,15 +722,18 @@ out: } int -netbsd32_pwritev(struct lwp *l, const struct netbsd32_pwritev_args *uap, register_t *retval) +netbsd32_pwritev(l, v, retval) + struct lwp *l; + void *v; + register_t *retval; { - /* { + struct netbsd32_pwritev_args /* { syscallarg(int) fd; syscallarg(const netbsd32_iovecp_t) iovp; syscallarg(int) iovcnt; syscallarg(int) pad; syscallarg(off_t) offset; - } */ + } */ *uap = v; struct proc *p = l->l_proc; struct filedesc *fdp = p->p_fd; struct file *fp; @@ -720,13 +783,15 @@ int getcwd_common(struct vnode *, struct vnode *, char **, char *, int, int, struct lwp *); -int -netbsd32___getcwd(struct lwp *l, const struct netbsd32___getcwd_args *uap, register_t *retval) +int netbsd32___getcwd(l, v, retval) + struct lwp *l; + void *v; + register_t *retval; { - /* { + struct netbsd32___getcwd_args /* { syscallarg(char *) bufp; syscallarg(size_t) length; - } */ + } */ *uap = v; struct proc *p = l->l_proc; int error; char *path;