diff options
author | Roland McGrath <roland@hack.frob.com> | 2014-10-13 11:12:28 -0700 |
---|---|---|
committer | Roland McGrath <roland@hack.frob.com> | 2014-10-13 11:12:28 -0700 |
commit | 53544380266a8eb38bef9389562fba3ed58a0d11 (patch) | |
tree | d040f7c483990e8cf4bb8e11102f15c04a2f6514 /dirent | |
parent | fcb32af153a745414b0d949e707c9485ab77d6ba (diff) | |
download | glibc-roland/Wshadow.zip glibc-roland/Wshadow.tar.gz glibc-roland/Wshadow.tar.bz2 |
Diffstat (limited to 'dirent')
-rw-r--r-- | dirent/scandir.c | 6 | ||||
-rw-r--r-- | dirent/scandirat.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/dirent/scandir.c b/dirent/scandir.c index ae03630..1311e86c 100644 --- a/dirent/scandir.c +++ b/dirent/scandir.c @@ -34,13 +34,13 @@ int -SCANDIR (dir, namelist, select, cmp) +SCANDIR (dir, namelist, selector, cmp) const char *dir; DIRENT_TYPE ***namelist; - int (*select) (const DIRENT_TYPE *); + int (*selector) (const DIRENT_TYPE *); int (*cmp) (const DIRENT_TYPE **, const DIRENT_TYPE **); { - return SCANDIRAT (AT_FDCWD, dir, namelist, select, cmp); + return SCANDIRAT (AT_FDCWD, dir, namelist, selector, cmp); } #ifdef _DIRENT_MATCHES_DIRENT64 diff --git a/dirent/scandirat.c b/dirent/scandirat.c index 01fc046..bc31e84 100644 --- a/dirent/scandirat.c +++ b/dirent/scandirat.c @@ -52,11 +52,11 @@ __scandir_cancel_handler (void *arg) int -SCANDIRAT (dfd, dir, namelist, select, cmp) +SCANDIRAT (dfd, dir, namelist, selector, cmp) int dfd; const char *dir; DIRENT_TYPE ***namelist; - int (*select) (const DIRENT_TYPE *); + int (*selector) (const DIRENT_TYPE *); int (*cmp) (const DIRENT_TYPE **, const DIRENT_TYPE **); { DIR *dp = __opendirat (dfd, dir); @@ -79,12 +79,12 @@ SCANDIRAT (dfd, dir, namelist, select, cmp) while ((d = READDIR (dp)) != NULL) { - int use_it = select == NULL; + int use_it = selector == NULL; if (! use_it) { - use_it = select (d); - /* The select function might have changed errno. It was + use_it = (*selector) (d); + /* The SELECTOR function might have changed errno. It was zero before and it need to be again to make the latter tests work. */ __set_errno (0); @@ -95,7 +95,7 @@ SCANDIRAT (dfd, dir, namelist, select, cmp) DIRENT_TYPE *vnew; size_t dsize; - /* Ignore errors from select or readdir */ + /* Ignore errors from SELECTOR or readdir. */ __set_errno (0); if (__glibc_unlikely (c.cnt == vsize)) |