d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename some local variables to avoid shadowing other local variables.

Browse Source 
Found by: -Wshadow
This commit is contained in:
Poul-Henning Kamp 1997-11-07 09:21:01 +00:00
parent 4a11ca4e29
commit 0abc78a697
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=31017
19 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/amd64/amd64/machdep.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.269 1997/10/12 20:23:17 phk Exp $
* $Id: machdep.c,v 1.270 1997/11/06 19:28:02 phk Exp $
*/
#include "apm.h"
@ -228,10 +228,10 @@ cpu_startup(dummy)
printf("Physical memory chunk(s):\n");
for (indx = 0; phys_avail[indx + 1] != 0; indx += 2) {
int size = phys_avail[indx + 1] - phys_avail[indx];
int size1 = phys_avail[indx + 1] - phys_avail[indx];
printf("0x%08lx - 0x%08lx, %d bytes (%d pages)\n", phys_avail[indx],
phys_avail[indx + 1] - 1, size, size / PAGE_SIZE);
phys_avail[indx + 1] - 1, size1, size1 / PAGE_SIZE);
}
}

6
sys/amd64/amd64/pmap.c
View File

@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
* $Id: pmap.c,v 1.169 1997/10/28 15:58:11 bde Exp $
* $Id: pmap.c,v 1.170 1997/11/07 08:52:29 phk Exp $
*/
/*
@ -2001,8 +2001,8 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
}
} else if (pbits & PG_RW) {
if (pbits & PG_M) {
vm_offset_t sva = i386_ptob(sindex);
if ((pbits & PG_MANAGED) && pmap_track_modified(sva)) {
vm_offset_t sva1 = i386_ptob(sindex);
if ((pbits & PG_MANAGED) && pmap_track_modified(sva1)) {
vm_page_t m = PHYS_TO_VM_PAGE(pbits);
m->dirty = VM_PAGE_BITS_ALL;
}

8
sys/dev/syscons/syscons.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.c,v 1.236 1997/10/26 07:36:13 yokota Exp $
* $Id: syscons.c,v 1.237 1997/11/07 08:52:42 phk Exp $
*/
#include "sc.h"
@ -1087,15 +1087,15 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
cur_console->status |= MOUSE_VISIBLE;
if ((MOUSE_TTY)->t_state & TS_ISOPEN) {
u_char buf[5];
int i;
int j;
buf[0] = 0x80 | ((~mouse->u.data.buttons) & 0x07);
buf[1] = (mouse->u.data.x & 0x1fe >> 1);
buf[3] = (mouse->u.data.x & 0x1ff) - buf[1];
buf[2] = -(mouse->u.data.y & 0x1fe >> 1);
buf[4] = -(mouse->u.data.y & 0x1ff) - buf[2];
for (i=0; i<5; i++)
(*linesw[(MOUSE_TTY)->t_line].l_rint)(buf[i],MOUSE_TTY);
for (j=0; j<5; j++)
(*linesw[(MOUSE_TTY)->t_line].l_rint)(buf[j],MOUSE_TTY);
}
if (cur_console->mouse_signal) {
cur_console->mouse_buttons = mouse->u.data.buttons;

6
sys/i386/i386/machdep.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.269 1997/10/12 20:23:17 phk Exp $
* $Id: machdep.c,v 1.270 1997/11/06 19:28:02 phk Exp $
*/
#include "apm.h"
@ -228,10 +228,10 @@ cpu_startup(dummy)
printf("Physical memory chunk(s):\n");
for (indx = 0; phys_avail[indx + 1] != 0; indx += 2) {
int size = phys_avail[indx + 1] - phys_avail[indx];
int size1 = phys_avail[indx + 1] - phys_avail[indx];
printf("0x%08lx - 0x%08lx, %d bytes (%d pages)\n", phys_avail[indx],
phys_avail[indx + 1] - 1, size, size / PAGE_SIZE);
phys_avail[indx + 1] - 1, size1, size1 / PAGE_SIZE);
}
}

6
sys/i386/i386/pmap.c
View File

@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
* $Id: pmap.c,v 1.169 1997/10/28 15:58:11 bde Exp $
* $Id: pmap.c,v 1.170 1997/11/07 08:52:29 phk Exp $
*/
/*
@ -2001,8 +2001,8 @@ pmap_protect(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, vm_prot_t prot)
}
} else if (pbits & PG_RW) {
if (pbits & PG_M) {
vm_offset_t sva = i386_ptob(sindex);
if ((pbits & PG_MANAGED) && pmap_track_modified(sva)) {
vm_offset_t sva1 = i386_ptob(sindex);
if ((pbits & PG_MANAGED) && pmap_track_modified(sva1)) {
vm_page_t m = PHYS_TO_VM_PAGE(pbits);
m->dirty = VM_PAGE_BITS_ALL;
}

8
sys/i386/isa/if_zp.c
View File

@ -34,7 +34,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
* $Id: if_zp.c,v 1.39 1997/09/21 21:41:14 gibbs Exp $
* $Id: if_zp.c,v 1.40 1997/10/26 04:36:14 nate Exp $
*/
/*-
* TODO:
@ -537,9 +537,9 @@ zpattach(isa_dev)
GO_WINDOW(0);
{
short tmp_addr[3];
int i;
for (i = 0; i < 3; i++) {
tmp_addr[i] = htons(read_eeprom_data(BASE, i));
int j;
for (j = 0; j < 3; j++) {
tmp_addr[i] = htons(read_eeprom_data(BASE, j));
}
bcopy(tmp_addr, sc->arpcom.ac_enaddr, 6);
}

6
sys/i386/isa/ncr5380.c
View File

@ -203,10 +203,10 @@ static adapter_t ncadata[NNCA];
* Print the message on timeout.
*/
#define WAITFOR(condition,count,message) {\
register u_long cnt = count; char *msg = message;\
register u_long cnt = count; char *_msg = message;\
while (cnt-- && ! (condition)) continue;\
if (cnt == -1 && msg)\
printf ("nca: %s timeout\n", msg); }
if (cnt == -1 && _msg)\
printf ("nca: %s timeout\n", _msg); }
static int nca_probe (struct isa_device *dev);
static int nca_attach (struct isa_device *dev);

14
sys/i386/isa/seagate.c
View File

@ -60,7 +60,7 @@
* that category, with the possible exception of scanners and
* some of the older MO drives.
*
* $Id: seagate.c,v 1.25 1997/08/25 23:06:29 bde Exp $
* $Id: seagate.c,v 1.26 1997/09/21 21:41:35 gibbs Exp $
*/
/*
@ -291,16 +291,16 @@ static adapter_t seadata[NSEA];
* Print the message on timeout.
*/
#define WAITFOR(condition,message) {\
register u_long cnt = 100000; char *msg = message;\
register u_long cnt = 100000; char *_msg = message;\
while (cnt-- && ! (condition)) continue;\
if (cnt == -1 && msg)\
printf ("sea: %s timeout\n", msg); }
if (cnt == -1 && _msg)\
printf ("sea: %s timeout\n", _msg); }
#define WAITFOR10(condition,message) {\
register u_long cnt = 1000000; char *msg = message;\
register u_long cnt = 1000000; char *_msg = message;\
while (cnt-- && ! (condition)) continue;\
if (cnt == -1 && msg)\
printf ("sea: %s timeout\n", msg); }
if (cnt == -1 && _msg)\
printf ("sea: %s timeout\n", _msg); }
/*
* Seagate adapter does not support in hardware

8
sys/i386/isa/syscons.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.c,v 1.236 1997/10/26 07:36:13 yokota Exp $
* $Id: syscons.c,v 1.237 1997/11/07 08:52:42 phk Exp $
*/
#include "sc.h"
@ -1087,15 +1087,15 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
cur_console->status |= MOUSE_VISIBLE;
if ((MOUSE_TTY)->t_state & TS_ISOPEN) {
u_char buf[5];
int i;
int j;
buf[0] = 0x80 | ((~mouse->u.data.buttons) & 0x07);
buf[1] = (mouse->u.data.x & 0x1fe >> 1);
buf[3] = (mouse->u.data.x & 0x1ff) - buf[1];
buf[2] = -(mouse->u.data.y & 0x1fe >> 1);
buf[4] = -(mouse->u.data.y & 0x1ff) - buf[2];
for (i=0; i<5; i++)
(*linesw[(MOUSE_TTY)->t_line].l_rint)(buf[i],MOUSE_TTY);
for (j=0; j<5; j++)
(*linesw[(MOUSE_TTY)->t_line].l_rint)(buf[j],MOUSE_TTY);
}
if (cur_console->mouse_signal) {
cur_console->mouse_buttons = mouse->u.data.buttons;

20
sys/i386/isa/wd.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
* $Id: wd.c,v 1.142 1997/11/04 09:28:54 phk Exp $
* $Id: wd.c,v 1.143 1997/11/07 08:52:45 phk Exp $
*/
/* TODO:
@ -829,7 +829,7 @@ wdstart(int ctrlr)
/* if starting a multisector transfer, or doing single transfers */
if (du->dk_skip == 0 || (du->dk_flags & DKFL_SINGLE)) {
u_int command;
u_int count;
u_int count1;
long cylin, head, sector;
cylin = blknum / secpercyl;
@ -843,14 +843,14 @@ wdstart(int ctrlr)
if (wdtab[ctrlr].b_errcnt && (bp->b_flags & B_READ) == 0)
du->dk_bc += DEV_BSIZE;
count = howmany( du->dk_bc, DEV_BSIZE);
count1 = howmany( du->dk_bc, DEV_BSIZE);
du->dk_flags &= ~DKFL_MULTI;
#ifdef B_FORMAT
if (bp->b_flags & B_FORMAT) {
command = WDCC_FORMAT;
count = lp->d_nsectors;
count1 = lp->d_nsectors;
sector = lp->d_gap3 - 1; /* + 1 later */
} else
#endif
@ -859,7 +859,7 @@ wdstart(int ctrlr)
if (du->dk_flags & DKFL_SINGLE) {
command = (bp->b_flags & B_READ)
? WDCC_READ : WDCC_WRITE;
count = 1;
count1 = 1;
du->dk_currentiosize = 1;
} else {
if((du->dk_flags & DKFL_USEDMA) &&
@ -873,8 +873,8 @@ wdstart(int ctrlr)
command = WDCC_READ_DMA;
else
command = WDCC_WRITE_DMA;
du->dk_currentiosize = count;
} else if( (count > 1) && (du->dk_multi > 1)) {
du->dk_currentiosize = count1;
} else if( (count1 > 1) && (du->dk_multi > 1)) {
du->dk_flags |= DKFL_MULTI;
if( bp->b_flags & B_READ) {
command = WDCC_READ_MULTI;
@ -882,8 +882,8 @@ wdstart(int ctrlr)
command = WDCC_WRITE_MULTI;
}
du->dk_currentiosize = du->dk_multi;
if( du->dk_currentiosize > count)
du->dk_currentiosize = count;
if( du->dk_currentiosize > count1)
du->dk_currentiosize = count1;
} else {
if( bp->b_flags & B_READ) {
command = WDCC_READ;
@ -918,7 +918,7 @@ wdstart(int ctrlr)
du->dk_bc,
bp->b_flags & B_READ);
}
while (wdcommand(du, cylin, head, sector, count, command)
while (wdcommand(du, cylin, head, sector, count1, command)
!= 0) {
wderror(bp, du,
"wdstart: timeout waiting to give command");

8
sys/isa/syscons.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: syscons.c,v 1.236 1997/10/26 07:36:13 yokota Exp $
* $Id: syscons.c,v 1.237 1997/11/07 08:52:42 phk Exp $
*/
#include "sc.h"
@ -1087,15 +1087,15 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
cur_console->status |= MOUSE_VISIBLE;
if ((MOUSE_TTY)->t_state & TS_ISOPEN) {
u_char buf[5];
int i;
int j;
buf[0] = 0x80 | ((~mouse->u.data.buttons) & 0x07);
buf[1] = (mouse->u.data.x & 0x1fe >> 1);
buf[3] = (mouse->u.data.x & 0x1ff) - buf[1];
buf[2] = -(mouse->u.data.y & 0x1fe >> 1);
buf[4] = -(mouse->u.data.y & 0x1ff) - buf[2];
for (i=0; i<5; i++)
(*linesw[(MOUSE_TTY)->t_line].l_rint)(buf[i],MOUSE_TTY);
for (j=0; j<5; j++)
(*linesw[(MOUSE_TTY)->t_line].l_rint)(buf[j],MOUSE_TTY);
}
if (cur_console->mouse_signal) {
cur_console->mouse_buttons = mouse->u.data.buttons;

10
sys/kern/subr_diskslice.c
View File

@ -43,7 +43,7 @@
* from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
* $Id: subr_diskslice.c,v 1.37 1997/09/02 20:05:50 bde Exp $
* $Id: subr_diskslice.c,v 1.38 1997/09/16 10:11:49 bde Exp $
*/
#include <sys/param.h>
@ -397,12 +397,12 @@ dsioctl(dname, dev, cmd, data, flags, sspp, strat, setgeom)
return (EINVAL);
if (!*(int *)data)
for (slice = 0; slice < ssp->dss_nslices; slice++) {
u_char openmask;
u_char openmask1;
openmask = ssp->dss_slices[slice].ds_openmask;
if (openmask
openmask1 = ssp->dss_slices[slice].ds_openmask;
if (openmask1
&& (slice != WHOLE_DISK_SLICE
|| openmask & ~(1 << RAW_PART)))
|| openmask1 & ~(1 << RAW_PART)))
return (EBUSY);
}

8
sys/libkern/qdivrem.c
View File

@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id$
* $Id: qdivrem.c,v 1.6 1997/02/22 09:39:57 peter Exp $
*/
/*
@ -213,9 +213,9 @@ __qdivrem(uq, vq, arq)
rhat = uj1;
goto qhat_too_big;
} else {
u_long n = COMBINE(uj0, uj1);
qhat = n / v1;
rhat = n % v1;
u_long nn = COMBINE(uj0, uj1);
qhat = nn / v1;
rhat = nn % v1;
}
while (v2 * qhat > COMBINE(rhat, uj2)) {
qhat_too_big:

12
sys/netinet/ip_output.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ip_output.c 8.3 (Berkeley) 1/21/94
* $Id: ip_output.c,v 1.60 1997/10/12 20:25:26 phk Exp $
* $Id: ip_output.c,v 1.61 1997/11/05 20:17:23 joerg Exp $
*/
#define _IP_VHL
@ -235,12 +235,12 @@ ip_output(m0, opt, ro, flags, imo)
* of outgoing interface.
*/
if (ip->ip_src.s_addr == INADDR_ANY) {
register struct in_ifaddr *ia;
register struct in_ifaddr *ia1;
for (ia = in_ifaddrhead.tqh_first; ia;
ia = ia->ia_link.tqe_next)
if (ia->ia_ifp == ifp) {
ip->ip_src = IA_SIN(ia)->sin_addr;
for (ia1 = in_ifaddrhead.tqh_first; ia1;
ia1 = ia1->ia_link.tqe_next)
if (ia1->ia_ifp == ifp) {
ip->ip_src = IA_SIN(ia1)->sin_addr;
break;
}
}

10
sys/nfs/nfs_vnops.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95
* $Id: nfs_vnops.c,v 1.70 1997/10/26 20:55:31 phk Exp $
* $Id: nfs_vnops.c,v 1.71 1997/10/27 13:33:44 bde Exp $
*/
@ -349,12 +349,12 @@ nfs_access(ap)
if (vp->v_type == VREG)
error = nfs_readrpc(vp, &auio, ap->a_cred);
else if (vp->v_type == VDIR) {
char* buf;
buf = malloc(NFS_DIRBLKSIZ, M_TEMP, M_WAITOK);
aiov.iov_base = buf;
char* bp;
bp = malloc(NFS_DIRBLKSIZ, M_TEMP, M_WAITOK);
aiov.iov_base = bp;
aiov.iov_len = auio.uio_resid = NFS_DIRBLKSIZ;
error = nfs_readdirrpc(vp, &auio, ap->a_cred);
free(buf, M_TEMP);
free(bp, M_TEMP);
} else if (vp->v_type = VLNK)
error = nfs_readlinkrpc(vp, &auio, ap->a_cred);
else

10
sys/nfsclient/nfs_vnops.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95
* $Id: nfs_vnops.c,v 1.70 1997/10/26 20:55:31 phk Exp $
* $Id: nfs_vnops.c,v 1.71 1997/10/27 13:33:44 bde Exp $
*/
@ -349,12 +349,12 @@ nfs_access(ap)
if (vp->v_type == VREG)
error = nfs_readrpc(vp, &auio, ap->a_cred);
else if (vp->v_type == VDIR) {
char* buf;
buf = malloc(NFS_DIRBLKSIZ, M_TEMP, M_WAITOK);
aiov.iov_base = buf;
char* bp;
bp = malloc(NFS_DIRBLKSIZ, M_TEMP, M_WAITOK);
aiov.iov_base = bp;
aiov.iov_len = auio.uio_resid = NFS_DIRBLKSIZ;
error = nfs_readdirrpc(vp, &auio, ap->a_cred);
free(buf, M_TEMP);
free(bp, M_TEMP);
} else if (vp->v_type = VLNK)
error = nfs_readlinkrpc(vp, &auio, ap->a_cred);
else

10
sys/pci/ncr.c
View File

@ -1,6 +1,6 @@
/**************************************************************************
**
** $Id: ncr.c,v 1.110 1997/09/10 20:46:11 se Exp $
** $Id: ncr.c,v 1.111 1997/09/21 22:02:16 gibbs Exp $
**
** Device driver for the NCR 53C810 PCI-SCSI-Controller.
**
@ -1341,7 +1341,7 @@ static void ncr_attach (pcici_t tag, int unit);
static char ident[] =
"\n$Id: ncr.c,v 1.110 1997/09/10 20:46:11 se Exp $\n";
"\n$Id: ncr.c,v 1.111 1997/09/21 22:02:16 gibbs Exp $\n";
static const u_long ncr_version = NCR_VERSION * 11
+ (u_long) sizeof (struct ncb) * 7
@ -4116,11 +4116,11 @@ static int32_t ncr_start (struct scsi_xfer * xp)
printf ("trying to transfer %8x bytes, mem addr = %8x\n",
xp->datalen, xp->data);
{
int i;
int j;
PRINT_ADDR(xp);
printf ("command: %2x (", cmd->opcode);
for (i = 0; i<11; i++)
printf (" %2x", cmd->bytes[i]);
for (j = 0; j<11; j++)
printf (" %2x", cmd->bytes[j]);
printf (")\n");
}
}

8
sys/vm/vm_object.c
View File

@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: vm_object.c,v 1.98 1997/09/21 04:24:22 dyson Exp $
* $Id: vm_object.c,v 1.99 1997/10/24 23:41:00 dyson Exp $
*/
/*
@ -406,16 +406,16 @@ vm_object_terminate(object)
*/
if (object->type == OBJT_VNODE) {
struct vnode *vp = object->handle;
struct proc *p = curproc; /* XXX */
struct proc *cp = curproc; /* XXX */
int waslocked;
waslocked = VOP_ISLOCKED(vp);
if (!waslocked)
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, cp);
vm_object_page_clean(object, 0, 0, TRUE, FALSE);
vinvalbuf(vp, V_SAVE, NOCRED, NULL, 0, 0);
if (!waslocked)
VOP_UNLOCK(vp, 0, p);
VOP_UNLOCK(vp, 0, cp);
}
/*

16
sys/vm/vm_swap.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)vm_swap.c 8.5 (Berkeley) 2/17/94
* $Id: vm_swap.c,v 1.47 1997/09/14 03:19:42 peter Exp $
* $Id: vm_swap.c,v 1.48 1997/11/06 19:29:56 phk Exp $
*/
#include <sys/param.h>
@ -281,21 +281,21 @@ swaponvp(p, vp, dev, nblks)
}
if (!swapdev_vp) {
struct vnode *vp;
struct vnode *vp1;
struct vnode *nvp;
error = getnewvnode(VT_NON, (struct mount *) 0,
spec_vnodeop_p, &nvp);
if (error)
panic("Cannot get vnode for swapdev");
vp = nvp;
vp->v_type = VBLK;
if ((nvp = checkalias(vp, swapdev,
vp1 = nvp;
vp1->v_type = VBLK;
if ((nvp = checkalias(vp1, swapdev,
(struct mount *) 0))) {
vput(vp);
vp = nvp;
vput(vp1);
vp1 = nvp;
}
swapdev_vp = vp;
swapdev_vp = vp1;
}
return (0);
}