Mercurial > hg > octave-lyh

changeset 9459:cb0b21f34abc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid double error messages in cellfun
author Jaroslav Hajek <highegg@gmail.com>
date Fri, 24 Jul 2009 11:41:41 +0200
parents 0c7d84a65386
children 1fddcf651559
files src/ChangeLog src/DLD-FUNCTIONS/cellfun.cc
diffstat 2 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-24  Jaroslav Hajek  <highegg@gmail.com>
+
+	* DLD-FUNCIONS/cellfun.cc (Fcellfun): Avoid double error messages.
+
 2009-07-24  Jaroslav Hajek  <highegg@gmail.com>
 
 	* load-path.cc (load_path::do_any_class_method): New method.
--- a/src/DLD-FUNCTIONS/cellfun.cc
+++ b/src/DLD-FUNCTIONS/cellfun.cc
@@ -500,15 +500,15 @@
                     goto cellfun_err;
                 }
 
+              if (error_state)
+                goto cellfun_err;
+
               if (tmp.length() < nargout)
                 {
                   error ("cellfun: too many output arguments");
                   goto cellfun_err;
                 }
 
-              if (error_state)
-                break;
-
               if (count == 0)
                 {
                   for (int j = 0; j < nargout; j++)
@@ -584,15 +584,15 @@
                     goto cellfun_err;
                 }
 
+              if (error_state)
+                goto cellfun_err;
+
               if (tmp.length() < nargout)
                 {
                   error ("cellfun: too many output arguments");
                   goto cellfun_err;
                 }
 
-              if (error_state)
-                break;
-
 
               for (int j = 0; j < nargout; j++)
                 results[j](count) = tmp(j);