From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 451 invoked from network); 27 Dec 2020 18:56:20 -0000 Received: from mother.openwall.net (195.42.179.200) by inbox.vuxu.org with ESMTPUTF8; 27 Dec 2020 18:56:20 -0000 Received: (qmail 15804 invoked by uid 550); 27 Dec 2020 18:56:05 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 5476 invoked from network); 27 Dec 2020 18:41:41 -0000 Date: Sun, 27 Dec 2020 18:41:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail; t=1609094490; bh=Al1d7oaELN1QFrVTznDvOS8sloaazdaXzNemHxvf/mw=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=INSs+4Bc3joFSWNHVuR59twgUzIQ/F8kGvNi9vYZ7WJARfg0sg6RWnF4XKlbFCLTe ABqyyIlpAOLol0jXharTMpGbSlSjoV8tm7bJfmm6140Cafwms5cb7sv/UdJTo20oVP P5wd9OSOH6kj0AOIpLlkcoaelYlTMGyA1FTvi5jW0odUHonQSf7s6IFXg0wrCUn0H2 5OE8bYaC18V/zCOClbblRGbaKutLM8qfGyjoIXoicxv19FkOt87ywxOlB8ytBOuIkF HCyTej5qu5g2jkFKlw7kXV1gRu7Nvjv8CY6svxBBApaK2hyKlupY0DHsHqbC/QBDUZ QQu+8mXbdshKg== To: Rich Felker , musl@lists.openwall.com From: Alexander Lobakin Cc: Alexander Lobakin Message-ID: <20201227184032.22413-6-alobakin@pm.me> In-Reply-To: <20201227184032.22413-1-alobakin@pm.me> References: <20201227183842.22030-1-alobakin@pm.me> <20201227184032.22413-1-alobakin@pm.me> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: [musl] [PATCH 06/18] timer_gettime: prefer time64 variant if available Instead of using time64 variant "only when needed", use it as a default and fallback to time32 only on -ENOSYS. Signed-off-by: Alexander Lobakin --- src/time/timer_gettime.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/time/timer_gettime.c b/src/time/timer_gettime.c index 21c9d32c3fe5..4f197f9a973c 100644 --- a/src/time/timer_gettime.c +++ b/src/time/timer_gettime.c @@ -9,9 +9,7 @@ int timer_gettime(timer_t t, struct itimerspec *val) =09=09t =3D (void *)(uintptr_t)(td->timer_id & INT_MAX); =09} #ifdef SYS_timer_gettime64 -=09int r =3D -ENOSYS; -=09if (sizeof(time_t) > 4) -=09=09r =3D __syscall(SYS_timer_gettime64, t, val); +=09int r =3D __syscall(SYS_timer_gettime64, t, val); =09if (SYS_timer_gettime =3D=3D SYS_timer_gettime64 || r!=3D-ENOSYS) =09=09return __syscall_ret(r); =09long val32[4]; --=20 2.29.2