This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 3/8] Y2038: add function __localtime64_r
- From: "Albert ARIBAUD (3ADEV)" <albert dot aribaud at 3adev dot fr>
- To: libc-alpha at sourceware dot org
- Date: Wed, 21 Nov 2018 01:28:39 +0100
- Subject: [PATCH 3/8] Y2038: add function __localtime64_r
- References: <20181121002844.14530-1-albert.aribaud@3adev.fr>
* include/time.h
(__localtime64_r): Add.
* time/localtime.c
(__localtime64_r): Add.
(__localtime_r): Compile only if __TIMERSIZE != 64.
---
include/time.h | 8 ++++++++
time/localtime.c | 16 ++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/include/time.h b/include/time.h
index 251a2b0329..34368295a9 100644
--- a/include/time.h
+++ b/include/time.h
@@ -66,6 +66,14 @@ libc_hidden_proto (__localtime64)
extern struct tm *__localtime_r (const time_t *__timer,
struct tm *__tp) attribute_hidden;
+
+#if __TIMESIZE == 64
+# define __localtime64_r __localtime_r
+#else
+extern struct tm *__localtime64_r (const __time64_t *__timer,
+ struct tm *__tp) attribute_hidden;
+#endif
+
extern struct tm *__gmtime_r (const time_t *__restrict __timer,
struct tm *__restrict __tp);
libc_hidden_proto (__gmtime_r)
diff --git a/time/localtime.c b/time/localtime.c
index 917e0db40a..bafea5548d 100644
--- a/time/localtime.c
+++ b/time/localtime.c
@@ -23,11 +23,27 @@ struct tm _tmbuf;
/* Return the `struct tm' representation of *T in local time,
using *TP to store the result. */
+struct tm *
+__localtime64_r (const __time64_t *t, struct tm *tp)
+{
+ return __tz_convert (*t, 1, tp);
+}
+
+/* Provide a 32-bit variant if needed */
+
+#if __TIMESIZE != 64
+
struct tm *
__localtime_r (const time_t *t, struct tm *tp)
{
return __tz_convert (*t, 1, tp);
}
+
+#endif
+
+/* This always works because either __TIMESIZE != 64 and __localtime_r
+ exists or __TIMESIZE == 64 and the definition of __localtime64_r above
+ actually defined __localtime_r. */
weak_alias (__localtime_r, localtime_r)
/* Return the `struct tm' representation of *T in local time. */
--
2.17.1