|
 |
c6d234 |
Introduce prototypes for scandir, scandirat. This was implemented
|
|
|
c6d234 |
upstream in:
|
|
|
c6d234 |
|
|
|
c6d234 |
commit d2ee815ad677bba720c4f0275c1d6065f5809e7a
|
|
|
c6d234 |
Author: Roland McGrath <roland@hack.frob.com>
|
|
|
c6d234 |
Date: Wed May 13 12:34:11 2015 -0700
|
|
|
c6d234 |
|
|
|
c6d234 |
Refactor scandir/scandirat to use common tail.
|
|
|
c6d234 |
|
|
|
c6d234 |
Not backported here because of its dependency on the fix for
|
|
|
c6d234 |
swbz#17999.
|
|
|
c6d234 |
|
|
|
c6d234 |
diff --git a/dirent/scandir.c b/dirent/scandir.c
|
|
|
c6d234 |
index 6dce54d64a3effa2..39c4c20e2b22804d 100644
|
|
|
c6d234 |
--- a/dirent/scandir.c
|
|
|
c6d234 |
+++ b/dirent/scandir.c
|
|
|
c6d234 |
@@ -34,11 +34,9 @@
|
|
|
c6d234 |
|
|
|
c6d234 |
|
|
|
c6d234 |
int
|
|
|
c6d234 |
-SCANDIR (dir, namelist, select, cmp)
|
|
|
c6d234 |
- const char *dir;
|
|
|
c6d234 |
- DIRENT_TYPE ***namelist;
|
|
|
c6d234 |
- int (*select) (const DIRENT_TYPE *);
|
|
|
c6d234 |
- int (*cmp) (const DIRENT_TYPE **, const DIRENT_TYPE **);
|
|
|
c6d234 |
+SCANDIR (const char *dir, DIRENT_TYPE ***namelist,
|
|
|
c6d234 |
+ int (*select) (const DIRENT_TYPE *),
|
|
|
c6d234 |
+ int (*cmp) (const DIRENT_TYPE **, const DIRENT_TYPE **))
|
|
|
c6d234 |
{
|
|
|
c6d234 |
return SCANDIRAT (AT_FDCWD, dir, namelist, select, cmp);
|
|
|
c6d234 |
}
|
|
|
c6d234 |
diff --git a/dirent/scandirat.c b/dirent/scandirat.c
|
|
|
c6d234 |
index c2704baa88ef71d0..0200171a64139933 100644
|
|
|
c6d234 |
--- a/dirent/scandirat.c
|
|
|
c6d234 |
+++ b/dirent/scandirat.c
|
|
|
c6d234 |
@@ -52,12 +52,9 @@ __scandir_cancel_handler (void *arg)
|
|
|
c6d234 |
|
|
|
c6d234 |
|
|
|
c6d234 |
int
|
|
|
c6d234 |
-SCANDIRAT (dfd, dir, namelist, select, cmp)
|
|
|
c6d234 |
- int dfd;
|
|
|
c6d234 |
- const char *dir;
|
|
|
c6d234 |
- DIRENT_TYPE ***namelist;
|
|
|
c6d234 |
- int (*select) (const DIRENT_TYPE *);
|
|
|
c6d234 |
- int (*cmp) (const DIRENT_TYPE **, const DIRENT_TYPE **);
|
|
|
c6d234 |
+SCANDIRAT (int dfd, const char *dir, DIRENT_TYPE ***namelist,
|
|
|
c6d234 |
+ int (*select) (const DIRENT_TYPE *),
|
|
|
c6d234 |
+ int (*cmp) (const DIRENT_TYPE **, const DIRENT_TYPE **))
|
|
|
c6d234 |
{
|
|
|
c6d234 |
DIR *dp = __opendirat (dfd, dir);
|
|
|
c6d234 |
DIRENT_TYPE **v = NULL;
|