Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/hpcmips/vr Rename local variable 'min' to 'mins' to...



details:   https://anonhg.NetBSD.org/src/rev/80dd856d3507
branches:  trunk
changeset: 581843:80dd856d3507
user:      he <he%NetBSD.org@localhost>
date:      Tue Jun 07 12:02:46 2005 +0000

description:
Rename local variable 'min' to 'mins' to avoid shadowing warning.

diffstat:

 sys/arch/hpcmips/vr/rtc.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (51 lines):

diff -r d4d24c3474e2 -r 80dd856d3507 sys/arch/hpcmips/vr/rtc.c
--- a/sys/arch/hpcmips/vr/rtc.c Tue Jun 07 12:02:04 2005 +0000
+++ b/sys/arch/hpcmips/vr/rtc.c Tue Jun 07 12:02:46 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtc.c,v 1.20 2003/07/15 02:29:34 lukem Exp $   */
+/*     $NetBSD: rtc.c,v 1.21 2005/06/07 12:02:46 he Exp $      */
 
 /*-
  * Copyright (c) 1999 Shin Takemura. All rights reserved.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.20 2003/07/15 02:29:34 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.21 2005/06/07 12:02:46 he Exp $");
 
 #include "opt_vr41xx.h"
 
@@ -330,7 +330,7 @@
        u_int32_t timel, /* 1/32768 sec */
        struct clock_ymdhms *dt)
 {
-       u_int32_t year, month, date, hour, min, sec, sec2;
+       u_int32_t year, month, date, hour, mins, sec, sec2;
 
        timeh -= EPOCHOFF;
 
@@ -373,19 +373,19 @@
        timeh -= hour*sec2;
 
        sec2 = SEC2MIN;
-       min = timeh/sec2;
-       timeh -= min*sec2;
+       mins = timeh/sec2;
+       timeh -= mins*sec2;
 
        sec = timeh*2 + timel/ETIME_L_HZ;       
 
-       DPRINTF(("cvt_timehl_ymdhms: hour %d min %d sec %d\n", hour, min, sec));
+       DPRINTF(("cvt_timehl_ymdhms: hour %d min %d sec %d\n", hour, mins, sec));
 
        if (dt) {
                dt->dt_year     = year - YBASE; /* base 1900 */
                dt->dt_mon      = month;
                dt->dt_day      = date;
                dt->dt_hour     = hour;
-               dt->dt_min      = min;
+               dt->dt_min      = mins;
                dt->dt_sec      = sec;
        }
 }



Home | Main Index | Thread Index | Old Index