diff options
| author |   Ulrich Drepper <drepper@redhat.com> | 2002-04-05 16:53:00 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-04-05 16:53:00 +0000 |
| commit | 55544141b859e3c640c52ce962727c5419a2fa6b (patch) | |
| tree | 7856dc1c51b15ed73d1dccfd7a291222778678cc /time | |
| parent | Don't overwrite r8 on error. (diff) | |
| download | glibc-55544141b859e3c640c52ce962727c5419a2fa6b.tar.gz glibc-55544141b859e3c640c52ce962727c5419a2fa6b.tar.bz2 glibc-55544141b859e3c640c52ce962727c5419a2fa6b.zip | |
Update.
2002-04-05 Jakub Jelinek <jakub@redhat.com>
* time/mktime.c (__mktime_internal): Move check for year < 70 below
all variable declarations.
2002-04-04 Andreas Schwab <schwab@suse.de>
* sysdeps/unix/sysv/linux/ia64/pipe.S: Don't overwrite r8 on error.
* sysdeps/unix/sysv/linux/x86_64/time.c: Removed.
* sysdeps/mips/dec/bits/endian.h: Removed since arch is not supported.
Diffstat (limited to 'time')
| -rw-r--r-- | time/mktime.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/time/mktime.c b/time/mktime.c index 101c197851..5632f14b78 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -246,10 +246,6 @@ __mktime_internal (struct tm *tp, int mon_years = mon / 12 - negative_mon_remainder; int year = year_requested + mon_years; - /* Only years after 1970 are defined. */ - if (year < 70) - return -1; - /* The other values need not be in range: the remaining code handles minor overflows correctly, assuming int and time_t arithmetic wraps around. @@ -262,6 +258,11 @@ __mktime_internal (struct tm *tp, + mday - 1); int sec_requested = sec; + + /* Only years after 1970 are defined. */ + if (year < 70) + return -1; + #if LEAP_SECONDS_POSSIBLE /* Handle out-of-range seconds specially, since ydhms_tm_diff assumes every minute has 60 seconds. */ |