From fbbf715d275ea646d8ce46710895b094dd5f6a77 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 24 Dec 2014 14:59:20 +0000 Subject: [PATCH] revert r48975 caused CI fauilures git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- dir.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dir.c b/dir.c index 77214761af..36e7a5ed69 100644 --- a/dir.c +++ b/dir.c @@ -1439,7 +1439,6 @@ glob_helper( char *plainname = 0; # endif IF_HAVE_HFS(int hfs_p); - IF_HAVE_HFS(int alpha_matched = 0); # ifdef DOSISH if (cur + 1 == end && (*cur)->type <= ALPHA) { plainname = join_path(path, pathlen, dirsep, (*cur)->str, strlen((*cur)->str)); @@ -1541,10 +1540,8 @@ glob_helper( # endif case PLAIN: case MAGICAL: - if (fnmatch(p->str, enc, name, flags) == 0) { - IF_HAVE_HFS(alpha_matched |= (p->type == ALPHA)); + if (fnmatch(p->str, enc, name, flags) == 0) *new_end++ = p->next; - } default: break; } @@ -1555,7 +1552,6 @@ glob_helper( GLOB_FREE(buf); GLOB_FREE(new_beg); if (status) break; - IF_HAVE_HFS(if (alpha_matched) break); } closedir(dirp);