Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix shadowed variable

This commit is contained in:
christos 2005-05-31 00:43:17 +00:00
parent 94984f467b
commit a7c4860a95
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/compat/svr4_32/svr4_32_misc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: svr4_32_misc.c,v 1.31 2005/04/19 19:00:25 christos Exp $ */
/* $NetBSD: svr4_32_misc.c,v 1.32 2005/05/31 00:43:17 christos Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: svr4_32_misc.c,v 1.31 2005/04/19 19:00:25 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: svr4_32_misc.c,v 1.32 2005/05/31 00:43:17 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -265,7 +265,7 @@ svr4_32_sys_getdents64(l, v, retval)
struct proc *p = l->l_proc;
struct dirent *bdp;
struct vnode *vp;
caddr_t inp, buf; /* BSD-format */
caddr_t inp, sbuf; /* BSD-format */
int len, reclen; /* BSD-format */
caddr_t outp; /* SVR4-format */
int resid, svr4_32_reclen; /* SVR4-format */
@ -294,11 +294,11 @@ svr4_32_sys_getdents64(l, v, retval)
}
buflen = min(MAXBSIZE, SCARG(uap, nbytes));
buf = malloc(buflen, M_TEMP, M_WAITOK);
sbuf = malloc(buflen, M_TEMP, M_WAITOK);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
off = fp->f_offset;
again:
aiov.iov_base = buf;
aiov.iov_base = sbuf;
aiov.iov_len = buflen;
auio.uio_iov = &aiov;
auio.uio_iovcnt = 1;
@ -316,7 +316,7 @@ again:
if (error)
goto out;
inp = buf;
inp = sbuf;
outp = (char *)(u_long) SCARG(uap, dp);
resid = SCARG(uap, nbytes);
if ((len = buflen - auio.uio_resid) == 0)
@ -374,7 +374,7 @@ out:
VOP_UNLOCK(vp, 0);
if (cookiebuf)
free(cookiebuf, M_TEMP);
free(buf, M_TEMP);
free(sbuf, M_TEMP);
out1:
FILE_UNUSE(fp, p);
return error;
@ -391,7 +391,7 @@ svr4_32_sys_getdents(l, v, retval)
struct proc *p = l->l_proc;
struct dirent *bdp;
struct vnode *vp;
caddr_t inp, buf; /* BSD-format */
caddr_t inp, sbuf; /* BSD-format */
int len, reclen; /* BSD-format */
caddr_t outp; /* SVR4-format */
int resid, svr4_reclen; /* SVR4-format */
@ -420,11 +420,11 @@ svr4_32_sys_getdents(l, v, retval)
}
buflen = min(MAXBSIZE, SCARG(uap, nbytes));
buf = malloc(buflen, M_TEMP, M_WAITOK);
sbuf = malloc(buflen, M_TEMP, M_WAITOK);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
off = fp->f_offset;
again:
aiov.iov_base = buf;
aiov.iov_base = sbuf;
aiov.iov_len = buflen;
auio.uio_iov = &aiov;
auio.uio_iovcnt = 1;
@ -442,7 +442,7 @@ again:
if (error)
goto out;
inp = buf;
inp = sbuf;
outp = (caddr_t)(u_long)SCARG(uap, buf);
resid = SCARG(uap, nbytes);
if ((len = buflen - auio.uio_resid) == 0)
@ -501,7 +501,7 @@ out:
VOP_UNLOCK(vp, 0);
if (cookiebuf)
free(cookiebuf, M_TEMP);
free(buf, M_TEMP);
free(sbuf, M_TEMP);
out1:
FILE_UNUSE(fp, p);
return error;