diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-08-21 09:57:15 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-08-21 09:57:15 -0700 |
| commit | e5dee2c896f04d88defdfa00282fa83f5f4004d8 (patch) | |
| tree | caebcffacffc0363dc418694eba18b2ce6b8617b /sysdeps/unix/sysv/linux/fxstatat64.c | |
| parent | 8c7c251746ce41779637c83e3b35639517f728d5 (diff) | |
| download | glibc-e5dee2c896f04d88defdfa00282fa83f5f4004d8.tar.gz glibc-e5dee2c896f04d88defdfa00282fa83f5f4004d8.tar.xz glibc-e5dee2c896f04d88defdfa00282fa83f5f4004d8.zip | |
Revert "Add INLINE_SYSCALL_RETURN/INLINE_SYSCALL_ERROR_RETURN"
This reverts commit 0c5b8b5941e036dcaac69cecee9f01fdf9218e6e.
Diffstat (limited to 'sysdeps/unix/sysv/linux/fxstatat64.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/fxstatat64.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/fxstatat64.c b/sysdeps/unix/sysv/linux/fxstatat64.c index f4cd094eca..a55cf1d155 100644 --- a/sysdeps/unix/sysv/linux/fxstatat64.c +++ b/sysdeps/unix/sysv/linux/fxstatat64.c @@ -32,17 +32,21 @@ int __fxstatat64 (int vers, int fd, const char *file, struct stat64 *st, int flag) { if (__glibc_unlikely (vers != _STAT_VER_LINUX)) - return INLINE_SYSCALL_ERROR_RETURN (-EINVAL, int, -1); + { + __set_errno (EINVAL); + return -1; + } int result; INTERNAL_SYSCALL_DECL (err); result = INTERNAL_SYSCALL (fstatat64, err, 4, fd, file, st, flag); - if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (result, err))) - return INLINE_SYSCALL_ERROR_RETURN (-INTERNAL_SYSCALL_ERRNO (result, - err), - int, -1); - else + if (!__builtin_expect (INTERNAL_SYSCALL_ERROR_P (result, err), 1)) return 0; + else + { + __set_errno (INTERNAL_SYSCALL_ERRNO (result, err)); + return -1; + } } libc_hidden_def (__fxstatat64) |