This is the mail archive of the mailing list for the glibc project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] Remove unused definition of __openat(64)_nocancel

This is no longer used since commit c6bb095.


	* sysdeps/unix/sysv/linux/openat.c (OPENAT_NOT_CANCEL): Don't define.
	* sysdeps/unix/sysv/linux/wordsize-64/openat.c
	(__openat64_nocancel): Likewise.
 sysdeps/unix/sysv/linux/openat.c             | 18 ------------------
 sysdeps/unix/sysv/linux/wordsize-64/openat.c |  3 ---
 2 files changed, 21 deletions(-)

diff --git a/sysdeps/unix/sysv/linux/openat.c b/sysdeps/unix/sysv/linux/openat.c
index ad8e31d..5d4cc0c 100644
--- a/sysdeps/unix/sysv/linux/openat.c
+++ b/sysdeps/unix/sysv/linux/openat.c
@@ -30,24 +30,6 @@
 # define OPENAT openat
-#define CONCAT(name) CONCAT2 (name)
-#define CONCAT2(name) __##name##_nocancel
-OPENAT_NOT_CANCEL (int fd, const char *file, int oflag, mode_t mode)
-  /* We have to add the O_LARGEFILE flag for openat64.  */
-  oflag |= MORE_OFLAGS;
-  return INLINE_SYSCALL (openat, 4, fd, file, oflag, mode);
 #define UNDERIZE(name) UNDERIZE_1 (name)
 #define UNDERIZE_1(name) __##name
diff --git a/sysdeps/unix/sysv/linux/wordsize-64/openat.c b/sysdeps/unix/sysv/linux/wordsize-64/openat.c
index 12e0271..be31a35 100644
--- a/sysdeps/unix/sysv/linux/wordsize-64/openat.c
+++ b/sysdeps/unix/sysv/linux/wordsize-64/openat.c
@@ -1,14 +1,11 @@
 #define __openat64 __rename___openat64
-#define __openat64_nocancel __rename___openat64_nocancel
 #define openat64 __rename_openat64
 #include "../openat.c"
 #undef __openat64
-#undef __openat64_nocancel
 #undef openat64
 strong_alias (__openat, __openat64)
 hidden_ver (__openat, __openat64)
-strong_alias (__openat_nocancel, __openat64_nocancel)
 weak_alias (openat, openat64)

Andreas Schwab, SUSE Labs,
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]