lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Revert "Add INLINE_SYSCALL_RETURN/INLINE_SYSCALL_ERROR_RETURN"

Browse Source 
This reverts commit 0c5b8b5941.
This commit is contained in:
H.J. Lu
2015-08-21 09:57:15 -07:00
parent 8c7c251746
commit e5dee2c896
64 changed files with 292 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sysdeps/unix/sysv/linux/signalfd.c
View File

@ -26,17 +26,11 @@ int
signalfd (int fd, const sigset_t *mask, int flags)
{
#ifdef __NR_signalfd4
int res = INLINE_SYSCALL (signalfd4, 4, fd, mask, _NSIG / 8, flags);
# ifndef __ASSUME_SIGNALFD4
INTERNAL_SYSCALL_DECL (err);
int res = INTERNAL_SYSCALL (signalfd4, err, 4, fd, mask, _NSIG / 8,
flags);
if (!__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (res, err))
|| INTERNAL_SYSCALL_ERRNO (res, err) != ENOSYS)
return res;
# else
return INLINE_SYSCALL_RETURN (signalfd4, 4, int, fd, mask, _NSIG / 8,
flags);
if (res != -1 || errno != ENOSYS)
# endif
return res;
#endif
#ifndef __ASSUME_SIGNALFD4
@ -45,12 +39,16 @@ signalfd (int fd, const sigset_t *mask, int flags)
kernel (sys_indirect) before implementing setting flags like
O_NONBLOCK etc. */
if (flags != 0)
return INLINE_SYSCALL_ERROR_RETURN (-EINVAL, int, -1);
{
__set_errno (EINVAL);
return -1;
}
# ifdef __NR_signalfd
return INLINE_SYSCALL_RETURN (signalfd, 3, int, fd, mask, _NSIG / 8);
return INLINE_SYSCALL (signalfd, 3, fd, mask, _NSIG / 8);
# else
return INLINE_SYSCALL_ERROR_RETURN (-ENOSYS, int, -1);
__set_errno (ENOSYS);
return -1;
# endif
#elif !defined __NR_signalfd4
# error "__ASSUME_SIGNALFD4 defined but not __NR_signalfd4"