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 381 invoked from network); 27 Dec 2020 18:55:56 -0000 Received: from mother.openwall.net (195.42.179.200) by inbox.vuxu.org with ESMTPUTF8; 27 Dec 2020 18:55:56 -0000 Received: (qmail 12214 invoked by uid 550); 27 Dec 2020 18:55:50 -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 5257 invoked from network); 27 Dec 2020 18:41:13 -0000 Date: Sun, 27 Dec 2020 18:40:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail; t=1609094461; bh=imdbU0RANmLmutXBK66sRCju6wmVJVuAdcj9ks59jm4=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=fkvP9kBjsnt3GHZuj0ou8ir+fSwAxbiKiUWAuTYRBvAXyIVYeqPmEEOm/RkM6S1xO ESHZQhkhKPXexr0vlh7tZFg7TIsc/teKxVtvkLiVRlpoXk+RSLb4/W/pP5IeOiOy4o 0nw0DOQKsnajuUZ8zfxYD8eB9lksnFckvn2JpTJjAwO7onbJ6J4B/f1kqX4l++2IwW xxUUZCa4jYFzAtffNEGR/d73tpe46J7UayvL/MsC1fAQgzHdvXXLpMyqKhb7vJdT5+ pLiode28gjEcUSFVeEn5cZlZy1VqivqiIxZfLAfAYQjA+1KbOP+5sUyfivUzGTbF68 PSOx/iBSqPULg== To: Rich Felker , musl@lists.openwall.com From: Alexander Lobakin Cc: Alexander Lobakin Message-ID: <20201227184032.22413-2-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 02/18] clock_settime: 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/clock_settime.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/time/clock_settime.c b/src/time/clock_settime.c index 1004ed152846..b6dbef04fad1 100644 --- a/src/time/clock_settime.c +++ b/src/time/clock_settime.c @@ -9,10 +9,8 @@ int clock_settime(clockid_t clk, const struct timespec *ts= ) #ifdef SYS_clock_settime64 =09time_t s =3D ts->tv_sec; =09long ns =3D ts->tv_nsec; -=09int r =3D -ENOSYS; -=09if (SYS_clock_settime =3D=3D SYS_clock_settime64 || !IS32BIT(s)) -=09=09r =3D __syscall(SYS_clock_settime64, clk, -=09=09=09((long long[]){s, ns})); +=09int r =3D __syscall(SYS_clock_settime64, clk, +=09=09((long long[]){s, ns})); =09if (SYS_clock_settime =3D=3D SYS_clock_settime64 || r!=3D-ENOSYS) =09=09return __syscall_ret(r); =09if (!IS32BIT(s)) --=20 2.29.2