Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/alpha/tc Rename an inner variable shadowing the 'v'...



details:   https://anonhg.NetBSD.org/src/rev/a1658b6fbd67
branches:  trunk
changeset: 581877:a1658b6fbd67
user:      he <he%NetBSD.org@localhost>
date:      Wed Jun 08 22:38:16 2005 +0000

description:
Rename an inner variable shadowing the 'v' parameter to appease -Wshadow.

diffstat:

 sys/arch/alpha/tc/tc_bus_mem.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 104a80302f08 -r a1658b6fbd67 sys/arch/alpha/tc/tc_bus_mem.c
--- a/sys/arch/alpha/tc/tc_bus_mem.c    Wed Jun 08 22:33:56 2005 +0000
+++ b/sys/arch/alpha/tc/tc_bus_mem.c    Wed Jun 08 22:38:16 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_bus_mem.c,v 1.25 2001/09/04 05:31:28 thorpej Exp $ */
+/* $NetBSD: tc_bus_mem.c,v 1.26 2005/06/08 22:38:16 he Exp $ */
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: tc_bus_mem.c,v 1.25 2001/09/04 05:31:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_bus_mem.c,v 1.26 2005/06/08 22:38:16 he Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -523,7 +523,7 @@
 {
 
        if ((memh & TC_SPACE_SPARSE) != 0) {
-               volatile u_int64_t *p, v;
+               volatile u_int64_t *p, vl;
                u_int64_t shift, msk;
 
                shift = off & 0x3;
@@ -532,7 +532,7 @@
                p = (u_int64_t *)(memh + (off << 1));
 
                msk = ~(0x1 << shift) & 0xf;
-               v = (msk << 32) | (((u_int64_t)val) << (shift * 8));
+               vl = (msk << 32) | (((u_int64_t)val) << (shift * 8));
 
                *p = val;
        } else {
@@ -553,7 +553,7 @@
 {
 
        if ((memh & TC_SPACE_SPARSE) != 0) {
-               volatile u_int64_t *p, v;
+               volatile u_int64_t *p, vl;
                u_int64_t shift, msk;
 
                shift = off & 0x2;
@@ -562,7 +562,7 @@
                p = (u_int64_t *)(memh + (off << 1));
 
                msk = ~(0x3 << shift) & 0xf;
-               v = (msk << 32) | (((u_int64_t)val) << (shift * 8));
+               vl = (msk << 32) | (((u_int64_t)val) << (shift * 8));
 
                *p = val;
        } else {



Home | Main Index | Thread Index | Old Index