aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2011-08-11 11:41:09 -0400
committerUlrich Drepper <drepper@gmail.com>2011-08-11 11:41:09 -0400
commit14d96785125abee5e9a49a1c3037f35a581750bd (patch)
tree321c675710dd076eeb13832637b978d6671dc969
parenta724d1b9bfa0f6ee9146b365e43ea6e245d0cf0c (diff)
downloadglibc-14d96785125abee5e9a49a1c3037f35a581750bd.tar
glibc-14d96785125abee5e9a49a1c3037f35a581750bd.tar.gz
glibc-14d96785125abee5e9a49a1c3037f35a581750bd.tar.bz2
glibc-14d96785125abee5e9a49a1c3037f35a581750bd.zip
Clean up PLT use for scandirat
-rw-r--r--ChangeLog8
-rw-r--r--dirent/scandirat.c1
-rw-r--r--dirent/scandirat64.c4
-rw-r--r--include/dirent.h7
-rw-r--r--sysdeps/unix/sysv/linux/i386/scandir64.c2
5 files changed, 13 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ca8232372..8ac7d9d0a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-10 Andreas Schwab <schwab@redhat.com>
+
+ * include/dirent.h: Add libc_hidden_proto for scandirat and
+ scandirat64. Don't declare __scandirat64.
+ * dirent/scandirat.c: Add libc_hidden_def.
+ * dirent/scandirat64.c (SCANDIRAT): Remove underscores.
+ * sysdeps/unix/sysv/linux/i386/scandir64.c (SCANDIRAT): Likewise.
+
2011-08-09 Ulrich Drepper <drepper@gmail.com>
* Versions.def [libc]: Add GLIBC_2.15.
diff --git a/dirent/scandirat.c b/dirent/scandirat.c
index e6f5ece76f..3eda9702e8 100644
--- a/dirent/scandirat.c
+++ b/dirent/scandirat.c
@@ -141,3 +141,4 @@ SCANDIRAT (dfd, dir, namelist, select, cmp)
return c.cnt;
}
+libc_hidden_def (SCANDIRAT)
diff --git a/dirent/scandirat64.c b/dirent/scandirat64.c
index c4afb90d3d..d41bdd1d66 100644
--- a/dirent/scandirat64.c
+++ b/dirent/scandirat64.c
@@ -18,11 +18,9 @@
#include <dirent.h>
-#define SCANDIRAT __scandirat64
+#define SCANDIRAT scandirat64
#define READDIR __readdir64
#define DIRENT_TYPE struct dirent64
#define SKIP_SCANDIR_CANCEL 1
#include "scandirat.c"
-
-weak_alias (__scandirat64, scandirat64)
diff --git a/include/dirent.h b/include/dirent.h
index 9ed5876892..7dbf622bbb 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -27,11 +27,6 @@ extern int __scandir64 (__const char * __dir,
int (*__selector) (__const struct dirent64 *),
int (*__cmp) (__const struct dirent64 **,
__const struct dirent64 **));
-extern int __scandirat64 (int __dfd, __const char * __dir,
- struct dirent64 *** __namelist,
- int (*__selector) (__const struct dirent64 *),
- int (*__cmp) (__const struct dirent64 **,
- __const struct dirent64 **));
extern __ssize_t __getdents (int __fd, char *__buf, size_t __nbytes)
internal_function;
extern __ssize_t __getdents64 (int __fd, char *__buf, size_t __nbytes)
@@ -47,5 +42,7 @@ extern DIR *__alloc_dir (int fd, bool close_fd, int flags,
extern void __scandir_cancel_handler (void *arg);
libc_hidden_proto (rewinddir)
+libc_hidden_proto (scandirat)
+libc_hidden_proto (scandirat64)
#endif
diff --git a/sysdeps/unix/sysv/linux/i386/scandir64.c b/sysdeps/unix/sysv/linux/i386/scandir64.c
index dacac0a44c..ae1970e1c3 100644
--- a/sysdeps/unix/sysv/linux/i386/scandir64.c
+++ b/sysdeps/unix/sysv/linux/i386/scandir64.c
@@ -19,7 +19,7 @@
#include <dirent.h>
#define SCANDIR __scandir64
-#define SCANDIRAT __scandirat64
+#define SCANDIRAT scandirat64
#define READDIR __readdir64
#define DIRENT_TYPE struct dirent64
#define SKIP_SCANDIR_CANCEL 1