Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/evbppc/walnut/dev Appease -Wshadow



details:   https://anonhg.NetBSD.org/src/rev/86b733153e62
branches:  trunk
changeset: 581631:86b733153e62
user:      scw <scw%NetBSD.org@localhost>
date:      Fri Jun 03 12:28:47 2005 +0000

description:
Appease -Wshadow

diffstat:

 sys/arch/evbppc/walnut/dev/todclock.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 527dfc9dff1d -r 86b733153e62 sys/arch/evbppc/walnut/dev/todclock.c
--- a/sys/arch/evbppc/walnut/dev/todclock.c     Fri Jun 03 12:18:46 2005 +0000
+++ b/sys/arch/evbppc/walnut/dev/todclock.c     Fri Jun 03 12:28:47 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: todclock.c,v 1.3 2004/07/05 07:28:45 pk Exp $  */
+/*     $NetBSD: todclock.c,v 1.4 2005/06/03 12:28:47 scw Exp $ */
 
 /*
  * Copyright (c) 1994-1997 Mark Brinicombe.
@@ -46,7 +46,7 @@
 /* Include header files */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: todclock.c,v 1.3 2004/07/05 07:28:45 pk Exp $");
+__KERNEL_RCSID(0, "$NetBSD: todclock.c,v 1.4 2005/06/03 12:28:47 scw Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -172,7 +172,7 @@
 resettodr(void)
 {
        int s;
-       time_t year, mon, day, hour, min, sec;
+       time_t year, mon, day, hour, minute, sec;
        rtc_t rtc;
 
        /* Have we set the system time in inittodr() */
@@ -216,14 +216,14 @@
        sec %= SECPERDAY;
        hour = sec / 3600;
        sec %= 3600;
-       min = sec / 60;
+       minute = sec / 60;
        sec %= 60;
        rtc.rtc_cen = year / 100;
        rtc.rtc_year = year % 100;
        rtc.rtc_mon = mon+1;
        rtc.rtc_day = day+1;
        rtc.rtc_hour = hour;
-       rtc.rtc_min = min;
+       rtc.rtc_min = minute;
        rtc.rtc_sec = sec;
        rtc.rtc_centi =
        rtc.rtc_micro = 0;



Home | Main Index | Thread Index | Old Index