From patchwork Thu Nov 29 22:10:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Albert ARIBAUD X-Patchwork-Id: 30398 Received: (qmail 27254 invoked by alias); 29 Nov 2018 22:10:18 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 27084 invoked by uid 89); 29 Nov 2018 22:10:17 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_NONE, RCVD_IN_RP_RNBL autolearn=ham version=3.3.2 spammy=Hx-languages-length:1787 X-HELO: smtp3-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Subject: [PATCH v2 3/9] Y2038: add function __localtime64_r Date: Thu, 29 Nov 2018 23:10:04 +0100 Message-Id: <20181129221010.19589-4-albert.aribaud@3adev.fr> In-Reply-To: <20181129221010.19589-1-albert.aribaud@3adev.fr> References: <20181129221010.19589-1-albert.aribaud@3adev.fr> Tested with 'make check' on x86_64-linux-gnu and i686-linux.gnu. * 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. */