This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.28.9000-76-g88ffb39
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 20 Aug 2018 16:34:55 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.28.9000-76-g88ffb39
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 88ffb39dc664bfec391c4d927f8c2145141bb7f0 (commit)
from e6edd40d61009e8a71bffe6fb2ef41a00c6f63d2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=88ffb39dc664bfec391c4d927f8c2145141bb7f0
commit 88ffb39dc664bfec391c4d927f8c2145141bb7f0
Author: Florian Weimer <fweimer@redhat.com>
Date: Mon Aug 20 18:23:28 2018 +0200
__readlink_chk: Assume HAVE_INLINED_SYSCALLS
HAVE_INLINED_SYSCALLS is always defined on Linux.
Switch to INLINE_SYSCALL_CALL as well.
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);
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/unix/sysv/linux/generic/readlink_chk.c | 8 +-------
2 files changed, 6 insertions(+), 7 deletions(-)
hooks/post-receive
--
GNU C Library master sources