qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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).

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
This commit is contained in:
Adhemerval Zanella 2020-07-09 16:42:14 -03:00
parent 02c91eb611
commit 4f7092348d
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sysdeps/unix/sysv/linux/clock_adjtime.c
View File

@ -26,15 +26,13 @@
int int
__clock_adjtime64 (const clockid_t clock_id, struct __timex64 *tx64) __clock_adjtime64 (const clockid_t clock_id, struct __timex64 *tx64)
{ {
#ifdef __ASSUME_TIME64_SYSCALLS #ifndef __NR_clock_adjtime64
# ifndef __NR_clock_adjtime64 # define __NR_clock_adjtime64 __NR_clock_adjtime
# define __NR_clock_adjtime64 __NR_clock_adjtime #endif
# endif int r = INLINE_SYSCALL_CALL (clock_adjtime64, clock_id, tx64);
return INLINE_SYSCALL_CALL (clock_adjtime64, clock_id, tx64); #ifndef __ASSUME_TIME64_SYSCALLS
#else if (r >= 0 || errno != ENOSYS)
int ret = INLINE_SYSCALL_CALL (clock_adjtime64, clock_id, tx64); return r;
if (errno != ENOSYS)
return ret;
if (tx64->modes & ADJ_SETOFFSET if (tx64->modes & ADJ_SETOFFSET
&& ! in_time_t_range (tx64->time.tv_sec)) && ! 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); struct timex tx32 = valid_timex64_to_timex (*tx64);
int retval = INLINE_SYSCALL_CALL (clock_adjtime, clock_id, &tx32); r = INLINE_SYSCALL_CALL (clock_adjtime, clock_id, &tx32);
if (retval >= 0) if (r >= 0)
*tx64 = valid_timex_to_timex64 (tx32); *tx64 = valid_timex_to_timex64 (tx32);
return retval;
#endif #endif
return r;
} }
#if __TIMESIZE != 64 #if __TIMESIZE != 64