Unify names of used global functions.

diff --git a/dirent/scandir.c b/dirent/scandir.c
index cffc8a9..ed9071d 100644 (file)
--- a/dirent/scandir.c
+++ b/dirent/scandir.c
@@ -28,7 +28,7 @@ scandir (dir, namelist, select, cmp)
      int (*select) __P ((const struct dirent *));
      int (*cmp) __P ((const void *, const void *));
 {
-  DIR *dp = opendir (dir);
+  DIR *dp = __opendir (dir);
   struct dirent **v = NULL;
   size_t vsize = 0, i;
   struct dirent *d;
@@ -74,7 +74,7 @@ scandir (dir, namelist, select, cmp)
   if (errno != 0)
     {
       save = errno;
-      (void) closedir (dp);
+      (void) __closedir (dp);
       while (i > 0)
        free (v[--i]);
       free (v);
@@ -82,7 +82,7 @@ scandir (dir, namelist, select, cmp)
       return -1;
     }
 
-  (void) closedir (dp);
+  (void) __closedir (dp);
   __set_errno (save);
 
   /* Sort the list if we have a comparison function to sort with.  */

diff --git a/dirent/scandir64.c b/dirent/scandir64.c
index a0b7406..e158b40 100644 (file)
--- a/dirent/scandir64.c
+++ b/dirent/scandir64.c
@@ -28,7 +28,7 @@ scandir64 (dir, namelist, select, cmp)
      int (*select) __P ((const struct dirent64 *));
      int (*cmp) __P ((const void *, const void *));
 {
-  DIR *dp = opendir (dir);
+  DIR *dp = __opendir (dir);
   struct dirent64 **v = NULL;
   size_t vsize = 0, i;
   struct dirent64 *d;
@@ -74,7 +74,7 @@ scandir64 (dir, namelist, select, cmp)
   if (errno != 0)
     {
       save = errno;
-      (void) closedir (dp);
+      (void) __closedir (dp);
       while (i > 0)
        free (v[--i]);
       free (v);
@@ -82,7 +82,7 @@ scandir64 (dir, namelist, select, cmp)
       return -1;
     }
 
-  (void) closedir (dp);
+  (void) __closedir (dp);
   __set_errno (save);
 
   /* Sort the list if we have a comparison function to sort with.  */

diff --git a/dirent/versionsort.c b/dirent/versionsort.c
index 88d6a61..e37682a 100644 (file)
--- a/dirent/versionsort.c
+++ b/dirent/versionsort.c
@@ -22,6 +22,6 @@
 int
 versionsort (const void *a, const void *b)
 {
-  return strverscmp ((*(const struct dirent **) a)->d_name,
-                    (*(const struct dirent **) b)->d_name);
+  return __strverscmp ((*(const struct dirent **) a)->d_name,
+                      (*(const struct dirent **) b)->d_name);
 }

diff --git a/dirent/versionsort64.c b/dirent/versionsort64.c
index b21f246..dab34d6 100644 (file)
--- a/dirent/versionsort64.c
+++ b/dirent/versionsort64.c
@@ -22,6 +22,6 @@
 int
 versionsort64 (const void *a, const void *b)
 {
-  return strverscmp ((*(const struct dirent64 **) a)->d_name,
-                    (*(const struct dirent64 **) b)->d_name);
+  return __strverscmp ((*(const struct dirent64 **) a)->d_name,
+                      (*(const struct dirent64 **) b)->d_name);
 }