From df86f1c3641eeb60d605ca9f38166d18397e86c0 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 9 Apr 2014 09:08:55 -0700 Subject: [PATCH] fts: avoid unnecessary strlen calls * lib/fts.c (fts_build): Go back to using _D_EXECT_NAMLEN when that can be faster than strlen. --- ChangeLog | 6 ++++++ lib/fts.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e9a383ab5..fb2f7a1e4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-04-09 Paul Eggert + + fts: avoid unnecessary strlen calls + * lib/fts.c (fts_build): Go back to using _D_EXECT_NAMLEN + when that can be faster than strlen. + 2014-03-26 Bernhard Voelker fts: avoid unnecessary strlen calls diff --git a/lib/fts.c b/lib/fts.c index 660aeffbd6..992bbad777 100644 --- a/lib/fts.c +++ b/lib/fts.c @@ -1451,8 +1451,9 @@ fts_build (register FTS *sp, int type) if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name)) continue; - d_namelen = strlen (dp->d_name); - if ((p = fts_alloc (sp, dp->d_name, d_namelen)) == NULL) + d_namelen = _D_EXACT_NAMLEN (dp); + p = fts_alloc (sp, dp->d_name, d_namelen); + if (!p) goto mem1; if (d_namelen >= maxlen) { /* include space for NUL */ -- 2.39.5