[src/trunk]: src/sys/arch/shark Appease -Wshadow

[scw <scw%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8a70a1f3c44c
branches:  trunk
changeset: 581642:8a70a1f3c44c
user:      scw <scw%NetBSD.org@localhost>
date:      Fri Jun 03 13:02:35 2005 +0000

description:
Appease -Wshadow

diffstat:

 sys/arch/shark/isa/clock.c      |  16 ++++++++--------
 sys/arch/shark/ofw/oftodclock.c |  10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diffs (89 lines):

diff -r ddccc5848c77 -r 8a70a1f3c44c sys/arch/shark/isa/clock.c
--- a/sys/arch/shark/isa/clock.c        Fri Jun 03 13:01:29 2005 +0000
+++ b/sys/arch/shark/isa/clock.c        Fri Jun 03 13:02:35 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: clock.c,v 1.7 2004/02/13 11:36:17 wiz Exp $    */
+/*     $NetBSD: clock.c,v 1.8 2005/06/03 13:03:35 scw Exp $    */
 
 /*
  * Copyright 1997
@@ -154,7 +154,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.7 2004/02/13 11:36:17 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.8 2005/06/03 13:03:35 scw Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -462,7 +462,7 @@
 delay(n)
        unsigned n;
 {
-       int tick, otick;
+       int ticks, otick;
        int nticks;
 
        if (n < 100) {
@@ -494,12 +494,12 @@
        }
 
        while (nticks > 0) {
-               tick = gettick();
-               if (tick > otick)
-                       nticks -= TIMER0_ROLLOVER - (tick - otick);
+               ticks = gettick();
+               if (ticks > otick)
+                       nticks -= TIMER0_ROLLOVER - (ticks - otick);
                else
-                       nticks -= otick - tick;
-               otick = tick;
+                       nticks -= otick - ticks;
+               otick = ticks;
        }
 
 }
diff -r ddccc5848c77 -r 8a70a1f3c44c sys/arch/shark/ofw/oftodclock.c
--- a/sys/arch/shark/ofw/oftodclock.c   Fri Jun 03 13:01:29 2005 +0000
+++ b/sys/arch/shark/ofw/oftodclock.c   Fri Jun 03 13:02:35 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: oftodclock.c,v 1.3 2003/07/15 03:36:02 lukem Exp $     */
+/*     $NetBSD: oftodclock.c,v 1.4 2005/06/03 13:02:35 scw Exp $       */
 
 /*
  * Copyright 1997
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oftodclock.c,v 1.3 2003/07/15 03:36:02 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oftodclock.c,v 1.4 2005/06/03 13:02:35 scw Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -250,7 +250,7 @@
 {
        time_t n;
        int diff, i, j;
-       int sec, min, hr, dom, mon, yr;
+       int sec, minute, hr, dom, mon, yr;
 
        /* old version of the firmware? */
        if (ofrtc_ihandle == 0) return;
@@ -266,7 +266,7 @@
        n = (time.tv_sec - diff) % (3600 * 24);   /* hrs+mins+secs */
        sec = n % 60;
        n /= 60;
-       min = n % 60;
+       minute = n % 60;
        hr  = n / 60;
 
        n = (time.tv_sec - diff) / (3600 * 24); /* days */
@@ -285,6 +285,6 @@
        dom = ++n;
 
        if (OF_call_method("set-time", ofrtc_ihandle, 6, 0,
-            sec, min, hr, dom, mon, yr))
+            sec, minute, hr, dom, mon, yr))
                printf("OFW RTC: set-time failed\n");
 }