Mercurial > octave-nkf

changeset 7784:d3a7882fa0b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style fixes
author John W. Eaton <jwe@octave.org>
date Tue, 20 May 2008 16:24:50 -0400
parents e8394097d66f
children 9a656cd34f34
files liboctave/regex-match.cc
diffstat 1 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/regex-match.cc	Tue May 20 16:22:30 2008 -0400
+++ b/liboctave/regex-match.cc	Tue May 20 16:24:50 2008 -0400
@@ -93,21 +93,24 @@
   compiled = new regex_t [npat];
 
   for (i = 0; i < npat; i++)
-    if (err = regcomp (compiled + i, pat(i).c_str (), 
-		       (REG_NOSUB | REG_EXTENDED |
-			(case_insen ? REG_ICASE : 0))))
-      break;
+    {
+      err = regcomp (compiled + i, pat(i).c_str (), 
+		     (REG_NOSUB | REG_EXTENDED |
+		      (case_insen ? REG_ICASE : 0)));
+      if (err)
+	break;
+    }
   
   if (err)
     {
-      int len = regerror(err, compiled + i, 0, 0);
+      int len = regerror (err, compiled + i, 0, 0);
       OCTAVE_LOCAL_BUFFER (char, errmsg, len);
       regerror(err, compiled + i, errmsg, len);
       (*current_liboctave_error_handler) ("%s in pattern (%s)", errmsg, 
 					  pat(i).c_str());
 
       for (int j = 0; j < i + 1; j++)
-	regfree(compiled + j);
+	regfree (compiled + j);
     }
 #else
   (*current_liboctave_error_handler) 
@@ -124,7 +127,7 @@
   const char *str = s.c_str ();
 
   for (int i = 0; i < npat; i++)
-    if (regexec(compiled + i, str, 0, 0, 0) == 0) 
+    if (regexec (compiled + i, str, 0, 0, 0) == 0) 
       return true;
 #endif