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

linux: Simplify mq_timedreceive 

With arch-syscall.h it can now assumes the existance of either
__NR_mq_timedreceive or __NR_mq_timedreceive_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>
This commit is contained in:
Adhemerval Zanella 2020-07-10 10:41:23 -03:00
parent ff6228d5c6
commit 1e03b6d828
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sysdeps/unix/sysv/linux/mq_timedreceive.c
View File

@ -26,15 +26,13 @@ __mq_timedreceive_time64 (mqd_t mqdes, char *__restrict msg_ptr, size_t msg_len,
unsigned int *__restrict msg_prio, unsigned int *__restrict msg_prio,
const struct __timespec64 *__restrict abs_timeout) const struct __timespec64 *__restrict abs_timeout)
{ {
#ifdef __ASSUME_TIME64_SYSCALLS #ifndef __NR_mq_timedreceive_time64
# ifndef __NR_mq_timedreceive_time64 # define __NR_mq_timedreceive_time64 __NR_mq_timedreceive
# define __NR_mq_timedreceive_time64 __NR_mq_timedreceive #endif
# endif
return SYSCALL_CANCEL (mq_timedreceive_time64, mqdes, msg_ptr, msg_len,
msg_prio, abs_timeout);
#else
int ret = SYSCALL_CANCEL (mq_timedreceive_time64, mqdes, msg_ptr, msg_len, int ret = SYSCALL_CANCEL (mq_timedreceive_time64, mqdes, msg_ptr, msg_len,
msg_prio, abs_timeout); msg_prio, abs_timeout);
#ifndef __ASSUME_TIME64_SYSCALLS
if (ret == 0 || errno != ENOSYS) if (ret == 0 || errno != ENOSYS)
return ret; return ret;
@ -50,9 +48,11 @@ __mq_timedreceive_time64 (mqd_t mqdes, char *__restrict msg_ptr, size_t msg_len,
ts32 = valid_timespec64_to_timespec (*abs_timeout); ts32 = valid_timespec64_to_timespec (*abs_timeout);
} }
return SYSCALL_CANCEL (mq_timedreceive, mqdes, msg_ptr, msg_len, msg_prio, ret = SYSCALL_CANCEL (mq_timedreceive, mqdes, msg_ptr, msg_len, msg_prio,
abs_timeout != NULL ? &ts32 : NULL); abs_timeout != NULL ? &ts32 : NULL);
#endif #endif
return ret;
} }
#if __TIMESIZE != 64 #if __TIMESIZE != 64