changeset 9942:314d2234b660

return logical result from fnmatch
author Jaroslav Hajek <highegg@gmail.com>
date Tue, 08 Dec 2009 12:57:01 +0100
parents 1369f13ae6b2
children 4c681ff57bc3
files src/ChangeLog src/dirfns.cc
diffstat 2 files changed, 5 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- 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  <highegg@gmail.com>
+
+	* dirfns.cc (Ffnmatch): Simplify.
+
 2009-12-08  Michael Goffioul  <michael.goffioul@gmail.com>
 
 	* ov-ch-mat.cc: Add missing #include.
--- 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<bool> 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