diff options
| author | Florian Weimer <fweimer@redhat.com> | 2018-08-20 18:23:28 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2018-08-20 18:24:09 +0200 |
| commit | 88ffb39dc664bfec391c4d927f8c2145141bb7f0 (patch) | |
| tree | adbc84d57498b3276d43e3b3c72da704d09b0684 | |
| parent | e6edd40d61009e8a71bffe6fb2ef41a00c6f63d2 (diff) | |
| download | glibc-88ffb39dc664bfec391c4d927f8c2145141bb7f0.tar.gz glibc-88ffb39dc664bfec391c4d927f8c2145141bb7f0.tar.xz glibc-88ffb39dc664bfec391c4d927f8c2145141bb7f0.zip | |
__readlink_chk: Assume HAVE_INLINED_SYSCALLS
HAVE_INLINED_SYSCALLS is always defined on Linux. Switch to INLINE_SYSCALL_CALL as well.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/generic/readlink_chk.c | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 7893962115..3807de147b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-08-20 Florian Weimer <fweimer@redhat.com> + + * sysdeps/unix/sysv/linux/generic/readlink_chk.c: Remove + HAVE_INLINED_SYSCALLS conditionals. Use INLINE_SYSCALL_CALL. + 2018-08-20 Joseph Myers <joseph@codesourcery.com> * sysdeps/unix/sysv/linux/sys/signalfd.h (struct diff --git a/sysdeps/unix/sysv/linux/generic/readlink_chk.c b/sysdeps/unix/sysv/linux/generic/readlink_chk.c index 9240408a6b..52d1f5b522 100644 --- a/sysdeps/unix/sysv/linux/generic/readlink_chk.c +++ b/sysdeps/unix/sysv/linux/generic/readlink_chk.c @@ -19,10 +19,8 @@ #include <unistd.h> #include <fcntl.h> #include <sys/param.h> -#ifdef HAVE_INLINED_SYSCALLS # include <errno.h> # include <sysdep.h> -#endif ssize_t @@ -31,9 +29,5 @@ __readlink_chk (const char *path, void *buf, size_t len, size_t buflen) if (len > buflen) __chk_fail (); -#ifdef HAVE_INLINED_SYSCALLS - return INLINE_SYSCALL (readlinkat, 4, AT_FDCWD, path, buf, len); -#else - return __readlink (path, buf, len); -#endif + return INLINE_SYSCALL_CALL (readlinkat, AT_FDCWD, path, buf, len); } |