diff options
Diffstat (limited to 'time')
| -rw-r--r-- | time/Makefile | 4 | ||||
| -rw-r--r-- | time/ap.c | 2 | ||||
| -rw-r--r-- | time/ctime.c | 9 | ||||
| -rw-r--r-- | time/localtime.c | 34 | ||||
| -rw-r--r-- | time/strftime.c | 2 | ||||
| -rw-r--r-- | time/tzset.c | 14 |
6 files changed, 30 insertions, 35 deletions
diff --git a/time/Makefile b/time/Makefile index e55b6641d3..966d9f2790 100644 --- a/time/Makefile +++ b/time/Makefile @@ -146,7 +146,3 @@ CFLAGS-zic.c = -Wno-strict-prototypes -DNOID $(tz-cflags) CFLAGS-ialloc.c = -Wno-strict-prototypes -DNOID CFLAGS-scheck.c = -Wno-strict-prototypes -DNOID CFLAGS-tzfile.c = $(tz-cflags) - -ifeq ($(malloc),new-malloc) -CFLAGS-ap.c = -DNO_MCHECK -endif diff --git a/time/ap.c b/time/ap.c index 9c1c0b3693..5319763384 100644 --- a/time/ap.c +++ b/time/ap.c @@ -29,9 +29,7 @@ main (int argc, char **argv) char buf[20]; time_t t; -#ifndef NO_MCHECK mcheck (NULL); -#endif if (argc != 1) fprintf(stderr, "Usage: %s\n", argv[0]); diff --git a/time/ctime.c b/time/ctime.c index f13d00e551..4f06f1e533 100644 --- a/time/ctime.c +++ b/time/ctime.c @@ -27,10 +27,7 @@ char * ctime (const time_t *t) { - static char buf[64]; /* POSIX.1 suggests at least 26 bytes. */ - struct tm tm; - struct tm *tp = __localtime_r (t, &tm); - if (tp == NULL) - return NULL; - return __asctime_r (tp, buf); + /* The C Standard says ctime (t) is equivalent to asctime (localtime (t)). + In particular, ctime and asctime must yield the same pointer. */ + return asctime (localtime (t)); } diff --git a/time/localtime.c b/time/localtime.c index 833d708b8d..5e1dd0a5b5 100644 --- a/time/localtime.c +++ b/time/localtime.c @@ -1,21 +1,21 @@ /* localtime -- convert `time_t' to `struct tm' in local time zone -Copyright (C) 1991, 92, 93, 95, 96 Free Software Foundation, Inc. -This file is part of the GNU C Library. + Copyright (C) 1991, 92, 93, 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 -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <errno.h> #include <time.h> @@ -24,6 +24,10 @@ Cambridge, MA 02139, USA. */ /* The C Standard says that localtime and gmtime return the same pointer. */ struct tm _tmbuf; +/* Prototype for the internal function to get information based on TZ. */ +extern void __tzset_internal __P ((void)); + + /* Return the `struct tm' representation of *TIMER in the local timezone. */ struct tm * localtime (timer) @@ -57,7 +61,7 @@ __localtime_r (timer, tp) __libc_lock_lock (__tzset_lock); /* Make sure the database is initialized. */ - __tzset (); + __tzset_internal (); if (__use_tzfile) { diff --git a/time/strftime.c b/time/strftime.c index ddea0240f6..fea545cd38 100644 --- a/time/strftime.c +++ b/time/strftime.c @@ -128,6 +128,8 @@ extern char *tzname[]; # define gmtime_r __gmtime_r # define localtime_r __localtime_r extern int __tz_compute __P ((time_t timer, const struct tm *tm)); +# define tzname __tzname +# define tzset __tzset #else # if ! HAVE_LOCALTIME_R # if ! HAVE_TM_GMTOFF diff --git a/time/tzset.c b/time/tzset.c index bbd562db6a..085dfcaa33 100644 --- a/time/tzset.c +++ b/time/tzset.c @@ -78,7 +78,7 @@ static char *old_tz = NULL; /* Interpret the TZ envariable. */ void -__tzset () +__tzset_internal () { register const char *tz; register size_t l; @@ -374,7 +374,7 @@ size_t __tzname_cur_max; long int __tzname_max () { - __tzset (); + __tzset_internal (); return __tzname_cur_max; } @@ -472,7 +472,7 @@ __tz_compute (timer, tm) time_t timer; const struct tm *tm; { - __tzset (); + __tzset_internal (); if (! compute_change (&tz_rules[0], 1900 + tm->tm_year) || ! compute_change (&tz_rules[1], 1900 + tm->tm_year)) @@ -505,14 +505,11 @@ __libc_lock_define (, __tzset_lock) #undef tzset void -#ifdef weak_function -weak_function -#endif -tzset (void) +__tzset (void) { __libc_lock_lock (__tzset_lock); - __tzset (); + __tzset_internal (); if (!__use_tzfile) { @@ -523,3 +520,4 @@ tzset (void) __libc_lock_unlock (__tzset_lock); } +weak_alias (__tzset, tzset) |