From patchwork Wed Nov 21 00:28:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Albert ARIBAUD X-Patchwork-Id: 30229 Received: (qmail 58979 invoked by alias); 21 Nov 2018 00:28:54 -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 58870 invoked by uid 89); 21 Nov 2018 00:28:53 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.9 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 autolearn=ham version=3.3.2 spammy= X-HELO: smtp3-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Subject: [PATCH 5/8] Y2038: add function __gmtime64_r Date: Wed, 21 Nov 2018 01:28:41 +0100 Message-Id: <20181121002844.14530-6-albert.aribaud@3adev.fr> In-Reply-To: <20181121002844.14530-1-albert.aribaud@3adev.fr> References: <20181121002844.14530-1-albert.aribaud@3adev.fr> * include/time.h (__gmtime64_r): Add. * time/gmtime.c (__gmtime64_r): Add. (__gmtime): Compile only if __TIMERSIZE != 64. --- include/time.h | 7 +++++++ time/gmtime.c | 15 +++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/time.h b/include/time.h index 553bf74828..80543e3673 100644 --- a/include/time.h +++ b/include/time.h @@ -82,6 +82,13 @@ libc_hidden_proto (__gmtime_r) # define __gmtime64 gmtime #endif +#if __TIMESIZE == 64 +# define __gmtime64_r __gmtime_r +#else +extern struct tm *__gmtime64_r (const __time64_t *__restrict __timer, + struct tm *__restrict __tp); +#endif + /* Compute the `struct tm' representation of T, offset OFFSET seconds east of UTC, and store year, yday, mon, mday, wday, hour, min, sec into *TP. diff --git a/time/gmtime.c b/time/gmtime.c index 46db119e9c..4674ffe01e 100644 --- a/time/gmtime.c +++ b/time/gmtime.c @@ -20,12 +20,27 @@ /* Return the `struct tm' representation of *T in UTC, using *TP to store the result. */ +struct tm * +__gmtime64_r (const __time64_t *t, struct tm *tp) +{ + return __tz_convert (*t, 0, tp); +} + +/* Provide a 32-bit variant if needed */ + +#if __TIMESIZE != 64 + struct tm * __gmtime_r (const time_t *t, struct tm *tp) { return __tz_convert (*t, 0, tp); } +#endif + +/* This always works because either __TIMESIZE != 64 and __gmtime_r exists + or __TIMESIZE == 64 and the definition of __gmtime64_r above actually + defined __gmtime_r. */ libc_hidden_def (__gmtime_r) weak_alias (__gmtime_r, gmtime_r)