From patchwork Tue Dec 18 14:09:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Albert ARIBAUD (3ADEV)" X-Patchwork-Id: 1015377 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-98480-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=3adev.fr Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="Mdz5HQaM"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43K0Kx00fwz9sC7 for ; Wed, 19 Dec 2018 01:10:44 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=J2ieGMPYfiXnWk9bo3AMwNMT/WNIOWN FMdZzWZl2PraWzCilLoZBz7T/zslYutn+iLGhZsna8q2sM1Br5G51gTFOGr5FYZs JDo4FbSVDFL7HYmmvePVjVBu/znQUZiQ8PU5E+OgRY2TH6ixHkSTnHTaMeyWWe0u q62Z9jV7kj1c= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=OS7wl7eonKY5hmreza878K7B+/Q=; b=Mdz5H QaM8SsKVH4m8kAd5saEiky6ZPIu2mL+JpH+rB5PtX9QFxdHuwHSfQSyb//I12uH1 Ipct7I9L/lxPaaa5AsJFlCN+R0H5wjcmBeIKY1YYUU/dP5v8viCxBy2ggjifcLGn biE581lu49y6PhyFcoX0Y8IZBAyPLuNwLlbQ98= Received: (qmail 10880 invoked by alias); 18 Dec 2018 14:10:13 -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 10758 invoked by uid 89); 18 Dec 2018 14:10:12 -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=2126 X-HELO: smtp3-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Subject: [PATCH v2 3/5] Y2038: add function __gmtime64_r Date: Tue, 18 Dec 2018 15:09:53 +0100 Message-Id: <20181218140955.7910-4-albert.aribaud@3adev.fr> In-Reply-To: <20181218140955.7910-1-albert.aribaud@3adev.fr> References: <20181218140955.7910-1-albert.aribaud@3adev.fr> Tested with 'make check' on x86_64-linux-gnu and i686-linux.gnu. * include/time.h (__gmtime64_r): Add. * time/gmtime.c (__gmtime64_r): Add. [__TIMESIZE != 64] (__gmtime): Turn into a wrapper. --- include/time.h | 8 ++++++++ time/gmtime.c | 18 +++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/include/time.h b/include/time.h index c5881acf9f..5a37c0ff79 100644 --- a/include/time.h +++ b/include/time.h @@ -86,6 +86,14 @@ extern struct tm *__gmtime64 (const __time64_t *__timer); libc_hidden_proto (__gmtime64) #endif +#if __TIMESIZE == 64 +# define __gmtime64_r __gmtime_r +#else +extern struct tm *__gmtime64_r (const __time64_t *__restrict __timer, + struct tm *__restrict __tp); +libc_hidden_proto(__gmtime64_r); +#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 ee901c3ba1..dff50f012f 100644 --- a/time/gmtime.c +++ b/time/gmtime.c @@ -21,10 +21,26 @@ /* Return the `struct tm' representation of *T in UTC, using *TP to store the result. */ struct tm * -__gmtime_r (const time_t *t, struct tm *tp) +__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 + +libc_hidden_def (__gmtime64_r) + +struct tm * +__gmtime_r (const time_t *t, struct tm *tp) +{ + __time64_t t64 = *t; + return __gmtime64_r (&t64, tp); +} + +#endif + libc_hidden_def (__gmtime_r) weak_alias (__gmtime_r, gmtime_r)