Mercurial > hg > octave-nkf > gnulib-hg
changeset 17797:dffad0ca4bc1
fts: port to C89
Problem reported for MSVC 16 by Gisle Vanem in:
http://lists.gnu.org/archive/html/bug-gnulib/2014-11/msg00027.html
* lib/fts.c (fts_build): Avoid declaration before statement.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Mon, 10 Nov 2014 15:43:22 -0800 |
| parents | e6ce17a54483 |
| children | ab5c8051cdec |
| files | ChangeLog lib/fts.c |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-11-10 Paul Eggert <eggert@cs.ucla.edu> + + fts: port to C89 + Problem reported for MSVC 16 by Gisle Vanem in: + http://lists.gnu.org/archive/html/bug-gnulib/2014-11/msg00027.html + * lib/fts.c (fts_build): Avoid declaration before statement. + 2014-11-06 Paul Eggert <eggert@cs.ucla.edu> unistd: port to iOS
--- a/lib/fts.c +++ b/lib/fts.c @@ -1293,6 +1293,7 @@ int dir_fd; FTSENT *cur = sp->fts_cur; bool continue_readdir = !!cur->fts_dirp; + size_t max_entries; /* When cur->fts_dirp is non-NULL, that means we should continue calling readdir on that existing DIR* pointer @@ -1354,8 +1355,7 @@ function. But when no such function is specified, we can read entries in batches that are large enough to help us with inode- sorting, yet not so large that we risk exhausting memory. */ - size_t max_entries = (sp->fts_compar == NULL - ? FTS_MAX_READDIR_ENTRIES : SIZE_MAX); + max_entries = sp->fts_compar ? SIZE_MAX : FTS_MAX_READDIR_ENTRIES; /* * Nlinks is the number of possible entries of type directory in the