From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 4EBF23851C1B; Thu, 30 Jul 2020 13:24:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4EBF23851C1B Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/y2038] linux: Simplify clock_adjtime X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/y2038 X-Git-Oldrev: 04726be814c6fd6d9cf974e15d684dd3ac1a180e X-Git-Newrev: ba1cef1d0b4454209c5b49aa7d53375ed9f0f0af Message-Id: <20200730132431.4EBF23851C1B@sourceware.org> Date: Thu, 30 Jul 2020 13:24:31 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jul 2020 13:24:31 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ba1cef1d0b4454209c5b49aa7d53375ed9f0f0af commit ba1cef1d0b4454209c5b49aa7d53375ed9f0f0af Author: Adhemerval Zanella Date: Thu Jul 9 16:42:14 2020 -0300 linux: Simplify clock_adjtime With arch-syscall.h it can now assumes the existance of either __NR_clock_adjtime or __NR_clock_adjtime_time64. The 32-bit time_t support is now only build for !__ASSUME_TIME64_SYSCALLS. Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 kernel). Diff: --- sysdeps/unix/sysv/linux/clock_adjtime.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/sysdeps/unix/sysv/linux/clock_adjtime.c b/sysdeps/unix/sysv/linux/clock_adjtime.c index 764a60b9bf..4caff2ad05 100644 --- a/sysdeps/unix/sysv/linux/clock_adjtime.c +++ b/sysdeps/unix/sysv/linux/clock_adjtime.c @@ -26,15 +26,13 @@ int __clock_adjtime64 (const clockid_t clock_id, struct __timex64 *tx64) { -#ifdef __ASSUME_TIME64_SYSCALLS -# ifndef __NR_clock_adjtime64 -# define __NR_clock_adjtime64 __NR_clock_adjtime -# endif - return INLINE_SYSCALL_CALL (clock_adjtime64, clock_id, tx64); -#else - int ret = INLINE_SYSCALL_CALL (clock_adjtime64, clock_id, tx64); - if (errno != ENOSYS) - return ret; +#ifndef __NR_clock_adjtime64 +# define __NR_clock_adjtime64 __NR_clock_adjtime +#endif + int r = INLINE_SYSCALL_CALL (clock_adjtime64, clock_id, tx64); +#ifndef __ASSUME_TIME64_SYSCALLS + if (r >= 0 || errno != ENOSYS) + return r; if (tx64->modes & ADJ_SETOFFSET && ! in_time_t_range (tx64->time.tv_sec)) @@ -44,12 +42,11 @@ __clock_adjtime64 (const clockid_t clock_id, struct __timex64 *tx64) } struct timex tx32 = valid_timex64_to_timex (*tx64); - int retval = INLINE_SYSCALL_CALL (clock_adjtime, clock_id, &tx32); - if (retval >= 0) + r = INLINE_SYSCALL_CALL (clock_adjtime, clock_id, &tx32); + if (r >= 0) *tx64 = valid_timex_to_timex64 (tx32); - - return retval; #endif + return r; } #if __TIMESIZE != 64