Clean up PLT use for scandirat

diff --git a/ChangeLog b/ChangeLog
index 3ca823237264e2bf9a0168cbe327a4b7384bda7c..8ac7d9d0a5e5ac1327bf11f86e6a135d937de3b0 100644 (file)
--- 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 e6f5ece76f6d76809824445487eb46f3a970c424..3eda9702e8e0a9a222916c6bb21affe294ffe7da 100644 (file)
--- 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 c4afb90d3d01d22793277c9e8e53768ad5f5139e..d41bdd1d6688e231fcb55e173afcbdcfb2cf9884 100644 (file)
--- 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 9ed587689229246b32f105699c0bc9665bea71b8..7dbf622bbbc8f11353f9f80ba7677bbbca4c0eaf 100644 (file)
--- 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 dacac0a44c23c8274104855557faf60de7be1843..ae1970e1c3b6eb4c9dc06fb1e5ca2ff9192a08eb 100644 (file)
--- 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