From bfa918cf570303b2e885e1383a077ee09e397837 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 4 Oct 2006 08:24:26 +0000 Subject: [PATCH] 2006-10-02 Dmitry V. Levin * fts.c (fts_close, fts_build, fts_palloc): Remove redundant checks. --- lib/ChangeLog | 4 ++++ lib/fts.c | 11 +++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index fb57d99d3..0b60f5b97 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2006-10-02 Dmitry V. Levin + + * fts.c (fts_close, fts_build, fts_palloc): Remove redundant checks. + 2006-10-02 Paolo Bonzini (tiny change) * quotearg.c (mbstate_t) [!HAVE_MBRTOWC]: #define to int. diff --git a/lib/fts.c b/lib/fts.c index 51115a8fe..8044cd5f8 100644 --- a/lib/fts.c +++ b/lib/fts.c @@ -459,8 +459,7 @@ fts_close (FTS *sp) /* Free up child linked list, sort array, file name 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); if (ISSET(FTS_CWDFD)) @@ -957,8 +956,7 @@ fts_build (register FTS *sp, int type) * structures already allocated. */ mem1: saved_errno = errno; - if (p) - free(p); + free(p); fts_lfree(head); closedir(dirp); cur->fts_info = FTS_ERR; @@ -1335,10 +1333,7 @@ fts_palloc (FTS *sp, size_t more) * See if fts_pathlen would overflow. */ if (new_len < sp->fts_pathlen) { - if (sp->fts_path) { - free(sp->fts_path); - sp->fts_path = NULL; - } + free(sp->fts_path); sp->fts_path = NULL; __set_errno (ENAMETOOLONG); return false; -- 2.11.0