[perl.git] branch smoke-me/fast_glob, updated. v5.25.12-31-g95344b08c6

[Yves Orton]

In perl.git, the branch smoke-me/fast_glob has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/95344b08c6dfddf5a9ac48c881e8609bafce2944?hp=0bdacb759e3990189c791e7276f43349671adb17>

- Log -----------------------------------------------------------------
commit 95344b08c6dfddf5a9ac48c881e8609bafce2944
Author: Yves Orton <demer...@gmail.com>
Date:   Tue Apr 25 19:58:46 2017 +0200

    ws fixup for new file (squash me)

M       ext/File-Glob/t/rt131211.t

commit 032e74d0c5573b5f38e28a7ff2cc417cfdf0d853
Author: Yves Orton <demer...@gmail.com>
Date:   Tue Apr 25 19:52:59 2017 +0200

    remove dead code from previous commit (squash me!)

M       ext/File-Glob/bsd_glob.c
-----------------------------------------------------------------------

Summary of changes:
 ext/File-Glob/bsd_glob.c   | 2 +-
 ext/File-Glob/t/rt131211.t | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/File-Glob/bsd_glob.c b/ext/File-Glob/bsd_glob.c
index 6c931a9c61..bd4109e6d5 100644
--- a/ext/File-Glob/bsd_glob.c
+++ b/ext/File-Glob/bsd_glob.c
@@ -815,7 +815,7 @@ glob3(Char *pathbuf, Char *pathbuf_last, Char *pathend, 
Char *pathend_last,
                        break;
                }
 
-               if (match(pathend, pattern, restpattern, nocase) < 1) {
+               if (match(pathend, pattern, restpattern, nocase)) {
                        *pathend = BG_EOS;
                        continue;
                }
diff --git a/ext/File-Glob/t/rt131211.t b/ext/File-Glob/t/rt131211.t
index 31ab5f256b..c58f71f893 100644
--- a/ext/File-Glob/t/rt131211.t
+++ b/ext/File-Glob/t/rt131211.t
@@ -31,7 +31,7 @@ while (++$count < 10) {
     $elapsed_match -= time;
     @got_files= glob catfile $path, "x".("a*" x $count) . "b";
     $elapsed_match += time;
-    
+
     $elapsed_fail -= time;
     @no_files= glob catfile $path, "x".("a*" x $count) . "c";
     $elapsed_fail += time;
@@ -48,7 +48,7 @@ is "@no_files", "", "shouldnt have files for xa*..c";
 is "@got_files", catfile($path, $files[1]), "only got the expected file for 
a*b*b*b*bc";
 
 @got_files= sort glob catfile $path, "a*b*b*bc";
-is "@got_files", catfile($path, $files[-1])." ".catfile($path,$files[1]), 
+is "@got_files", catfile($path, $files[-1])." ".catfile($path,$files[1]),
     "got the expected two files for a*b*b*bc";
 
 

--
Perl5 Master Repository