From patchwork Tue Dec 18 14:09:51 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: 1015374 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-98477-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="b5xdWL01"; 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 43K0KS1wGtz9sCh for ; Wed, 19 Dec 2018 01:10:20 +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=Uum3T2A0KDxnf57rw54ybggjdbEk8AP KGCBOY1tKAfTraopbgOggrbNPu+YIV/ky6UiJxqXGGbB9Pu1xRkCs3PZpLQJjTmW gZknkGg65/YLxQtlg4xDNK8eEdhMQTGA0GR0j7p6ittNF5jx1On1LUku7r5d4yIa qTpW4YsXnKdA= 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=/0y0979ZupC+eR7+5cUPHOEuXtc=; b=b5xdW L01BRFawW7IZz4NjjebTkO56JLnZAu1GrLlCDXLHsHgzw2M382XXx4HLz8dFV8bc 3do5W4p1SplbHgarR1U/f0Vi4bp4In8bK4VbCHOItD6vdakqOB1vOdfHP3Su/f2L xBiqTn8c1umSDp6r6xjE79iR9OCYj6rrzWyBpI= Received: (qmail 9795 invoked by alias); 18 Dec 2018 14:10:06 -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 9744 invoked by uid 89); 18 Dec 2018 14:10:05 -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 v2 1/5] Y2038: add function __localtime64_r Date: Tue, 18 Dec 2018 15:09:51 +0100 Message-Id: <20181218140955.7910-2-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 (__localtime64_r): Add. * time/localtime.c (__localtime64_r): Add. [__TIMESIZE != 64] (__localtime_r): Turn into a wrapper. --- include/time.h | 8 ++++++++ time/localtime.c | 17 ++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/include/time.h b/include/time.h index 3bc303a36e..876b8a2b5f 100644 --- a/include/time.h +++ b/include/time.h @@ -67,6 +67,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); +libc_hidden_proto (__localtime64_r) +#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 96879d4ec0..9367c7082b 100644 --- a/time/localtime.c +++ b/time/localtime.c @@ -25,10 +25,25 @@ struct tm _tmbuf; /* Return the `struct tm' representation of *T in local time, using *TP to store the result. */ struct tm * -__localtime_r (const time_t *t, struct tm *tp) +__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) +{ + __time64_t t64 = *t; + return __localtime64_r (&t64, tp); +} +libc_hidden_def (__localtime64_r) + +#endif + weak_alias (__localtime_r, localtime_r)