public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/azanella/y2038] linux: Simplify clock_adjtime Date: Thu, 30 Jul 2020 13:24:31 +0000 (GMT) [thread overview] Message-ID: <20200730132431.4EBF23851C1B@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ba1cef1d0b4454209c5b49aa7d53375ed9f0f0af commit ba1cef1d0b4454209c5b49aa7d53375ed9f0f0af Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> 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
reply other threads:[~2020-07-30 13:24 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200730132431.4EBF23851C1B@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).