qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fri Feb 16 11:01:59 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu> 

* time/tzset.c: Limit hours to 23, not 12.  From jaffer.
This commit is contained in:
Roland McGrath 1996-02-16 16:15:45 +00:00
parent 7c97bb094e
commit 1cbca0d93c
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Feb 16 11:01:59 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* time/tzset.c: Limit hours to 23, not 12. From jaffer.
Fri Feb 16 10:14:05 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu> Fri Feb 16 10:14:05 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>
* Makeconfig (CFLAGS-.po): Use -pg instead of -p. * Makeconfig (CFLAGS-.po): Use -pg instead of -p.

14
time/tzset.c
View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -177,7 +177,7 @@ DEFUN_VOID(__tzset)
break; break;
} }
tz_rules[0].offset *= (min(ss, 59) + (min(mm, 59) * 60) + 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) for (l = 0; l < 3; ++l)
{ {
@ -228,7 +228,7 @@ DEFUN_VOID(__tzset)
ss = 0; ss = 0;
case 3: case 3:
tz_rules[1].offset *= (min(ss, 59) + (min(mm, 59) * 60) + tz_rules[1].offset *= (min(ss, 59) + (min(mm, 59) * 60) +
(min(hh, 12) * (60 * 60))); (min(hh, 23) * (60 * 60)));
break; break;
} }
for (l = 0; l < 3; ++l) for (l = 0; l < 3; ++l)
@ -257,14 +257,14 @@ DEFUN_VOID(__tzset)
for (whichrule = 0; whichrule < 2; ++whichrule) for (whichrule = 0; whichrule < 2; ++whichrule)
{ {
register tz_rule *tzr = &tz_rules[whichrule]; register tz_rule *tzr = &tz_rules[whichrule];
if (*tz == ',') if (*tz == ',')
{ {
++tz; ++tz;
if (*tz == '\0') if (*tz == '\0')
return; return;
} }
/* Get the date of the change. */ /* Get the date of the change. */
if (*tz == 'J' || isdigit (*tz)) if (*tz == 'J' || isdigit (*tz))
{ {
@ -309,7 +309,7 @@ DEFUN_VOID(__tzset)
} }
else else
return; return;
if (*tz != '\0' && *tz != '/' && *tz != ',') if (*tz != '\0' && *tz != '/' && *tz != ',')
return; return;
else if (*tz == '/') else if (*tz == '/')
@ -375,7 +375,7 @@ DEFUN(compute_change, (rule, year), tz_rule *rule AND int year)
if (year != -1 && rule->computed_for == year) if (year != -1 && rule->computed_for == year)
/* Operations on times in 1969 will be slower. Oh well. */ /* Operations on times in 1969 will be slower. Oh well. */
return 1; return 1;
/* First set T to January 1st, 0:00:00 GMT in YEAR. */ /* First set T to January 1st, 0:00:00 GMT in YEAR. */
t = 0; t = 0;
for (y = 1970; y < year; ++y) for (y = 1970; y < year; ++y)