diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | time/mktime.c | 32 | ||||
| -rw-r--r-- | time/strftime.c | 52 | ||||
| -rw-r--r-- | time/timegm.c | 28 |
4 files changed, 67 insertions, 62 deletions
diff --git a/ChangeLog b/ChangeLog index e1191f9f89..1e33f9d370 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,23 @@ 2003-12-30 Paul Eggert <eggert@twinsun.com> + * time/mktime.c: (my_mktime_localtime_r): + Remove. All uses changed to __localtime_r. + (__localtime_r) [!defined _LIBC]: New macro. Include "time_r.h" to + get its implementation. + Fix compile-command to allow for TIME_R_POSIX. + + * time/strftime.c (my_strftime_gmtime_r, my_strftime_localtime_r): + Remove. All uses changed to __localtime_r and __gmtime_r. + (__gmtime_r, __localtime_r) [!HAVE_TM_GMTOFF]: New macros. + Include "time_r.h" to get their implementations. + + * time/timegm.c: Allow use in GNU applications outside glibc. + [defined HAVE_CONFIG_H]: Include <config.h>. + [!defined _LIBC]: Include "timegm.h", <time_r.h>. + Define __gmtime_r, and declare __mktime_internal. + (timegm): Define via a prototype, since we can safely assume C89 now. + * time/mktime.c (check_result): Use less-confusing report format. "long" -> "long int", as per usual GNU style. (main): Likewise. diff --git a/time/mktime.c b/time/mktime.c index e801928570..136984bad1 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -84,22 +84,15 @@ const unsigned short int __mon_yday[2][13] = }; -#ifdef _LIBC -# define my_mktime_localtime_r __localtime_r -#else -/* If we're a mktime substitute in a GNU program, then prefer - localtime to localtime_r, since many localtime_r implementations - are buggy. */ -static struct tm * -my_mktime_localtime_r (const time_t *t, struct tm *tp) -{ - struct tm *l = localtime (t); - if (! l) - return 0; - *tp = *l; - return tp; -} -#endif /* ! _LIBC */ +#ifndef _LIBC +/* Portable standalone applications should supply a "time_r.h" that + declares a POSIX-compliant localtime_r, for the benefit of older + implementations that lack localtime_r or have a nonstandard one. + See the gnulib time_r module for one way to implement this. */ +# include "time_r.h" +# undef __localtime_r +# define __localtime_r localtime_r +#endif /* Yield the difference between (YEAR-YDAY HOUR:MIN:SEC) and (*TP), @@ -188,9 +181,6 @@ ranged_convert (struct tm *(*convert) (const time_t *, struct tm *), Use *OFFSET to keep track of a guess at the offset of the result, compared to what the result would be for UTC without leap seconds. If *OFFSET's guess is correct, only one CONVERT call is needed. */ -#ifndef _LIBC -static -#endif time_t __mktime_internal (struct tm *tp, struct tm *(*convert) (const time_t *, struct tm *), @@ -376,7 +366,7 @@ mktime (struct tm *tp) __tzset (); #endif - return __mktime_internal (tp, my_mktime_localtime_r, &localtime_offset); + return __mktime_internal (tp, __localtime_r, &localtime_offset); } #ifdef weak_alias @@ -525,6 +515,6 @@ main (int argc, char **argv) /* Local Variables: -compile-command: "gcc -DDEBUG -Wall -W -O -g mktime.c -o mktime" +compile-command: "gcc -DDEBUG -DHAVE_TIME_R_POSIX -Wall -W -O -g mktime.c -o mktime" End: */ diff --git a/time/strftime.c b/time/strftime.c index d83020563e..04250317e3 100644 --- a/time/strftime.c +++ b/time/strftime.c @@ -167,44 +167,22 @@ extern char *tzname[]; #ifdef _LIBC -# define my_strftime_gmtime_r __gmtime_r -# define my_strftime_localtime_r __localtime_r # define tzname __tzname # define tzset __tzset -#else - -/* If we're a strftime substitute in a GNU program, then prefer gmtime - to gmtime_r, since many gmtime_r implementations are buggy. - Similarly for localtime_r. */ - -# if ! HAVE_TM_GMTOFF -static struct tm *my_strftime_gmtime_r __P ((const time_t *, struct tm *)); -static struct tm * -my_strftime_gmtime_r (t, tp) - const time_t *t; - struct tm *tp; -{ - struct tm *l = gmtime (t); - if (! l) - return 0; - *tp = *l; - return tp; -} -# endif /* ! HAVE_TM_GMTOFF */ +#endif -static struct tm *my_strftime_localtime_r __P ((const time_t *, struct tm *)); -static struct tm * -my_strftime_localtime_r (t, tp) - const time_t *t; - struct tm *tp; -{ - struct tm *l = localtime (t); - if (! l) - return 0; - *tp = *l; - return tp; -} -#endif /* ! defined _LIBC */ +#if !HAVE_TM_GMTOFF +/* Portable standalone applications should supply a "time_r.h" that + declares a POSIX-compliant localtime_r, for the benefit of older + implementations that lack localtime_r or have a nonstandard one. + Similarly for gmtime_r. See the gnulib time_r module for one way + to implement this. */ +# include "time_r.h" +# undef __gmtime_r +# undef __localtime_r +# define __gmtime_r gmtime_r +# define __localtime_r localtime_r +#endif #if !defined memset && !defined HAVE_MEMSET && !defined _LIBC @@ -1388,7 +1366,7 @@ my_strftime (s, maxsize, format, tp ut_argument LOCALE_PARAM) occurred. */ struct tm tm; - if (! my_strftime_localtime_r (<, &tm) + if (! __localtime_r (<, &tm) || ((ltm.tm_sec ^ tm.tm_sec) | (ltm.tm_min ^ tm.tm_min) | (ltm.tm_hour ^ tm.tm_hour) @@ -1398,7 +1376,7 @@ my_strftime (s, maxsize, format, tp ut_argument LOCALE_PARAM) break; } - if (! my_strftime_gmtime_r (<, >m)) + if (! __gmtime_r (<, >m)) break; diff = tm_diff (<m, >m); diff --git a/time/timegm.c b/time/timegm.c index 3a089664ca..bbc8c919ad 100644 --- a/time/timegm.c +++ b/time/timegm.c @@ -1,4 +1,6 @@ -/* Copyright (C) 1994, 1997 Free Software Foundation, Inc. +/* Convert UTC calendar time to simple time. Like mktime but assumes UTC. + + Copyright (C) 1994, 1997, 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 @@ -16,11 +18,29 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <time.h> +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + +#ifdef _LIBC +# include <time.h> +#else +# include "timegm.h" + +/* Portable standalone applications should supply a "time_r.h" that + declares a POSIX-compliant gmtime_r, for the benefit of older + implementations that lack gmtime_r or have a nonstandard one. + See the gnulib time_r module for one way to implement this. */ +# include <time_r.h> +# undef __gmtime_r +# define __gmtime_r gmtime_r +time_t __mktime_internal (struct tm *, + struct tm * (*) (time_t const *, struct tm *), + time_t *); +#endif time_t -timegm (tmp) - struct tm *const tmp; +timegm (struct tm *tmp) { static time_t gmtime_offset; tmp->tm_isdst = 0; |