OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[BZ #1962] 

* io/fts.c (fts_open): Change type of len to size_t.
	(fts_build): Remove cast in call to fts_alloc.
	(fts_alloc): Change third parameter's type to size_t.
This commit is contained in:
Ulrich Drepper 2005-12-21 08:34:35 +00:00
parent 87629a1c50
commit f9b2d293f0
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2005-12-21 Ulrich Drepper <drepper@redhat.com>
[BZ #1962]
* io/fts.c (fts_open): Change type of len to size_t.
(fts_build): Remove cast in call to fts_alloc.
(fts_alloc): Change third parameter's type to size_t.
[BZ #1960]
* io/fts.c (fts_open): Avoid function call in MAX macro use.

10
io/fts.c
View File

@ -53,7 +53,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#endif
static FTSENT *fts_alloc (FTS *, const char *, int) internal_function;
static FTSENT *fts_alloc (FTS *, const char *, size_t) internal_function;
static FTSENT *fts_build (FTS *, int) internal_function;
static void fts_lfree (FTSENT *) internal_function;
static void fts_load (FTS *, FTSENT *) internal_function;
@ -94,7 +94,6 @@ fts_open(argv, options, compar)
register FTSENT *p, *root;
register int nitems;
FTSENT *parent, *tmp;
int len;
/* Options check. */
if (options & ~FTS_OPTIONMASK) {
@ -132,7 +131,8 @@ fts_open(argv, options, compar)
/* Allocate/initialize root(s). */
for (root = NULL, nitems = 0; *argv != NULL; ++argv, ++nitems) {
/* Don't allow zero-length paths. */
if ((len = strlen(*argv)) == 0) {
size_t len = strlen(*argv);
if (len == 0) {
__set_errno (ENOENT);
goto mem3;
}
@ -691,7 +691,7 @@ fts_build(sp, type)
if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
continue;
if ((p = fts_alloc(sp, dp->d_name, (int)_D_EXACT_NAMLEN (dp))) == NULL)
if ((p = fts_alloc(sp, dp->d_name, _D_EXACT_NAMLEN (dp))) == NULL)
goto mem1;
if (_D_EXACT_NAMLEN (dp) >= maxlen) {/* include space for NUL */
oldaddr = sp->fts_path;
@ -962,7 +962,7 @@ internal_function
fts_alloc(sp, name, namelen)
FTS *sp;
const char *name;
register int namelen;
size_t namelen;
{
register FTSENT *p;
size_t len;