aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/generic/readlink_chk.c8
2 files changed, 6 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 7893962..3807de1 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 9240408..52d1f5b 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);
}