# HG changeset patch # User Jaroslav Hajek # Date 1260273421 -3600 # Node ID 314d2234b6603a2774bb156ef7da716c4a638338 # Parent 1369f13ae6b23ec2b38eacf03415bb5a1c5079f5 return logical result from fnmatch diff -r 1369f13ae6b2 -r 314d2234b660 src/ChangeLog --- a/src/ChangeLog Tue Dec 08 12:45:58 2009 +0100 +++ b/src/ChangeLog Tue Dec 08 12:57:01 2009 +0100 @@ -1,3 +1,7 @@ +2009-12-07 Jaroslav Hajek + + * dirfns.cc (Ffnmatch): Simplify. + 2009-12-08 Michael Goffioul * ov-ch-mat.cc: Add missing #include. diff -r 1369f13ae6b2 -r 314d2234b660 src/dirfns.cc --- a/src/dirfns.cc Tue Dec 08 12:45:58 2009 +0100 +++ b/src/dirfns.cc Tue Dec 08 12:57:01 2009 +0100 @@ -616,16 +616,7 @@ { glob_match pattern (file_ops::tilde_expand (pat)); - Array tmp = pattern.match (str); - - octave_idx_type n = tmp.length (); - - ColumnVector result (n); - - for (octave_idx_type i = 0; i < n; i++) - result(i) = tmp(i); - - retval = result; + retval = pattern.match (str); } } else