summaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2015-05-13 12:34:11 -0700
committerRoland McGrath <roland@hack.frob.com>2015-05-13 12:34:11 -0700
commitd2ee815ad677bba720c4f0275c1d6065f5809e7a (patch)
treebdf787aecee9e951a71ce1d852e26b4412743803 /sysdeps/unix/sysv
parent83c10893259916152d277327fa37d8f70bb4d4c2 (diff)
downloadglibc-d2ee815ad677bba720c4f0275c1d6065f5809e7a.tar.gz
Refactor scandir/scandirat to use common tail.
Diffstat (limited to 'sysdeps/unix/sysv')
-rw-r--r--sysdeps/unix/sysv/linux/i386/scandir64.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/scandir64.c b/sysdeps/unix/sysv/linux/i386/scandir64.c
index 824bf84bd2..86290780c4 100644
--- a/sysdeps/unix/sysv/linux/i386/scandir64.c
+++ b/sysdeps/unix/sysv/linux/i386/scandir64.c
@@ -17,22 +17,21 @@
#include <dirent.h>
-#define SCANDIR __scandir64
-#define SCANDIRAT scandirat64
-#define READDIR __readdir64
-#define DIRENT_TYPE struct dirent64
+#define SCANDIR __scandir64
+#define SCANDIR_TAIL __scandir64_tail
+#define DIRENT_TYPE struct dirent64
#include <dirent/scandir.c>
-#undef SCANDIR
-#undef READDIR
-#undef DIRENT_TYPE
+#undef SCANDIR
+#undef SCANDIR_TAIL
+#undef DIRENT_TYPE
#include <shlib-compat.h>
versioned_symbol (libc, __scandir64, scandir64, GLIBC_2_2);
-#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2)
+#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_2)
# include <string.h>
# include <errno.h>
# include "olddirent.h"