public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] linux: Simplify clock_settime
@ 2020-08-24 18:33 Adhemerval Zanella
0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2020-08-24 18:33 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ff6228d5c6b0fa34ecb51228be57392649ffc88e
commit ff6228d5c6b0fa34ecb51228be57392649ffc88e
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Fri Jul 10 10:04:14 2020 -0300
linux: Simplify clock_settime
With arch-syscall.h it can now assumes the existance of either
__NR_clock_settime or __NR_clock_settime_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).
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Diff:
---
sysdeps/unix/sysv/linux/clock_settime.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/clock_settime.c b/sysdeps/unix/sysv/linux/clock_settime.c
index ebda871f4c..ce0bf622c0 100644
--- a/sysdeps/unix/sysv/linux/clock_settime.c
+++ b/sysdeps/unix/sysv/linux/clock_settime.c
@@ -32,17 +32,15 @@ __clock_settime64 (clockid_t clock_id, const struct __timespec64 *tp)
return -1;
}
-#ifdef __ASSUME_TIME64_SYSCALLS
-# ifndef __NR_clock_settime64
-# define __NR_clock_settime64 __NR_clock_settime
-# endif
- return INLINE_SYSCALL_CALL (clock_settime64, clock_id, tp);
-#else
-# ifdef __NR_clock_settime64
+#ifndef __NR_clock_settime64
+# define __NR_clock_settime64 __NR_clock_settime
+#endif
int ret = INLINE_SYSCALL_CALL (clock_settime64, clock_id, tp);
+
+#ifndef __ASSUME_TIME64_SYSCALLS
if (ret == 0 || errno != ENOSYS)
return ret;
-# endif
+
if (! in_time_t_range (tp->tv_sec))
{
__set_errno (EOVERFLOW);
@@ -50,8 +48,10 @@ __clock_settime64 (clockid_t clock_id, const struct __timespec64 *tp)
}
struct timespec ts32 = valid_timespec64_to_timespec (*tp);
- return INLINE_SYSCALL_CALL (clock_settime, clock_id, &ts32);
+ ret = INLINE_SYSCALL_CALL (clock_settime, clock_id, &ts32);
#endif
+
+ return ret;
}
#if __TIMESIZE != 64
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-08-24 18:33 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-24 18:33 [glibc] linux: Simplify clock_settime Adhemerval Zanella
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).