diff options
Diffstat (limited to 'time')
| -rw-r--r-- | time/tzfile.c | 8 | ||||
| -rw-r--r-- | time/tzset.c | 9 |
2 files changed, 6 insertions, 11 deletions
diff --git a/time/tzfile.c b/time/tzfile.c index 24ef18f941..39b3c2f211 100644 --- a/time/tzfile.c +++ b/time/tzfile.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1993, 1995-2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1991-1993, 1995-2001, 2003 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 @@ -463,7 +463,7 @@ find_transition (time_t timer) return &types[i]; } -int +void __tzfile_compute (time_t timer, int use_localtime, long int *leap_correct, int *leap_hit, struct tm *tp) @@ -513,7 +513,7 @@ __tzfile_compute (time_t timer, int use_localtime, i = num_leaps; do if (i-- == 0) - return 1; + return; while (timer < leaps[i].transition); /* Apply its correction. */ @@ -532,8 +532,6 @@ __tzfile_compute (time_t timer, int use_localtime, --i; } } - - return 1; } static void diff --git a/time/tzset.c b/time/tzset.c index 02940589f7..6de96762e9 100644 --- a/time/tzset.c +++ b/time/tzset.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1999, 2000, 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1991-2002, 2003 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 @@ -567,11 +567,8 @@ __tz_convert (const time_t *timer, int use_localtime, struct tm *tp) tzset_internal (tp == &_tmbuf); if (__use_tzfile) - { - if (! __tzfile_compute (*timer, use_localtime, - &leap_correction, &leap_extra_secs, tp)) - tp = NULL; - } + __tzfile_compute (*timer, use_localtime, &leap_correction, + &leap_extra_secs, tp); else { if (! __offtime (timer, 0, tp)) |