diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2006-10-04 13:16:36 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2006-10-04 13:16:36 +0000 |
| commit | 4cd901381fc33271958aa2cb826309a515413cc3 (patch) | |
| tree | 5edcc0aac7823690f5b3d73fe4a5ee1999a83f04 /libc/io | |
| parent | d6e297f8c462e9d0a60da8e897f433b3d354b792 (diff) | |
Merge changes between r291 and r312 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@313 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/io')
| -rw-r--r-- | libc/io/fts.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/libc/io/fts.c b/libc/io/fts.c index 6383fe8f1..532743fb3 100644 --- a/libc/io/fts.c +++ b/libc/io/fts.c @@ -251,8 +251,7 @@ fts_close(sp) /* Free up child linked list, sort array, path buffer. */ if (sp->fts_child) fts_lfree(sp->fts_child); - if (sp->fts_array) - free(sp->fts_array); + free(sp->fts_array); free(sp->fts_path); /* Return to original directory, save errno if necessary. */ @@ -705,8 +704,7 @@ fts_build(sp, type) * structures already allocated. */ mem1: saved_errno = errno; - if (p) - free(p); + free(p); fts_lfree(head); (void)__closedir(dirp); cur->fts_info = FTS_ERR; @@ -1043,10 +1041,7 @@ fts_palloc(sp, more) * We limit fts_pathlen to USHRT_MAX to be safe in both cases. */ if (sp->fts_pathlen < 0 || sp->fts_pathlen >= USHRT_MAX) { - if (sp->fts_path) { - free(sp->fts_path); - sp->fts_path = NULL; - } + free(sp->fts_path); sp->fts_path = NULL; __set_errno (ENAMETOOLONG); return (1); |