Sat Apr 20 17:07:17 1996 Ulrich Drepper <drepper@cygnus.com>

[kopensolaris-gnu/glibc.git] / time / tzset.c

diff --git a/time/tzset.c b/time/tzset.c
index 3eac151..2635155 100644 (file)
--- a/time/tzset.c
+++ b/time/tzset.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -25,7 +25,7 @@ Cambridge, MA 02139, USA.  */
 #include <time.h>
 
 /* Defined in mktime.c.  */
-extern CONST unsigned short int __mon_lengths[2][12];
+extern CONST unsigned short int __mon_yday[2][13];
 
 #define NOID
 #include "tzfile.h"
@@ -36,20 +36,14 @@ extern void EXFUN(__tzfile_default, (char *std AND char *dst AND
                                     long int stdoff AND long int dstoff));
 extern int EXFUN(__tzfile_compute, (time_t, struct tm));
 
-#ifndef        HAVE_WEAK_SYMBOLS
-#define        __tzname        tzname
-#define        __daylight      daylight
-#define        __timezone      timezone
-#else
-weak_alias (__tzname, tzname)
-weak_alias (__daylight, daylight)
-weak_alias (__timezone, timezone)
-#endif
-
 char *__tzname[2] = { (char *) "GMT", (char *) "GMT" };
 int __daylight = 0;
 long int __timezone = 0L;
 
+weak_alias (__tzname, tzname)
+weak_alias (__daylight, daylight)
+weak_alias (__timezone, timezone)
+
 
 #define        min(a, b)       ((a) < (b) ? (a) : (b))
 #define        max(a, b)       ((a) > (b) ? (a) : (b))
@@ -183,7 +177,7 @@ DEFUN_VOID(__tzset)
       break;
     }
   tz_rules[0].offset *= (min(ss, 59) + (min(mm, 59) * 60) +
-                        (min(hh, 12) * 60 * 60));
+                        (min(hh, 23) * 60 * 60));
 
   for (l = 0; l < 3; ++l)
     {
@@ -234,7 +228,7 @@ DEFUN_VOID(__tzset)
       ss = 0;
     case 3:
       tz_rules[1].offset *= (min(ss, 59) + (min(mm, 59) * 60) +
-                            (min(hh, 12) * (60 * 60)));
+                            (min(hh, 23) * (60 * 60)));
       break;
     }
   for (l = 0; l < 3; ++l)
@@ -263,14 +257,14 @@ DEFUN_VOID(__tzset)
   for (whichrule = 0; whichrule < 2; ++whichrule)
     {
       register tz_rule *tzr = &tz_rules[whichrule];
-      
+
       if (*tz == ',')
        {
          ++tz;
          if (*tz == '\0')
            return;
        }
-      
+
       /* Get the date of the change.  */
       if (*tz == 'J' || isdigit (*tz))
        {
@@ -315,7 +309,7 @@ DEFUN_VOID(__tzset)
        }
       else
        return;
-      
+
       if (*tz != '\0' && *tz != '/' && *tz != ',')
        return;
       else if (*tz == '/')
@@ -381,7 +375,7 @@ DEFUN(compute_change, (rule, year), tz_rule *rule AND int year)
   if (year != -1 && rule->computed_for == year)
     /* Operations on times in 1969 will be slower.  Oh well.  */
     return 1;
-     
+
   /* First set T to January 1st, 0:00:00 GMT in YEAR.  */
   t = 0;
   for (y = 1970; y < year; ++y)
@@ -409,10 +403,11 @@ DEFUN(compute_change, (rule, year), tz_rule *rule AND int year)
       /* Mm.n.d - Nth "Dth day" of month M.  */
       {
        register int i, d, m1, yy0, yy1, yy2, dow;
+       register CONST unsigned short int *myday =
+         &__mon_yday[__isleap (year)][rule->m];
 
        /* First add SECSPERDAY for each day in months before M.  */
-       for (i = 0; i < rule->m - 1; ++i)
-         t += __mon_lengths[__isleap (year)][i] * SECSPERDAY;
+       t += myday[-1] * SECSPERDAY;
 
        /* Use Zeller's Congruence to get day-of-week of first day of month. */
        m1 = (rule->m + 9) % 12 + 1;
@@ -430,7 +425,7 @@ DEFUN(compute_change, (rule, year), tz_rule *rule AND int year)
          d += 7;
        for (i = 1; i < rule->n; ++i)
          {
-           if (d + 7 >= __mon_lengths[__isleap (year)][rule->m - 1])
+           if (d + 7 >= myday[0] - myday[-1])
              break;
            d += 7;
          }