Mercurial > octave-nkf
diff src/DLD-FUNCTIONS/cellfun.cc @ 9459:cb0b21f34abc
avoid double error messages in cellfun
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Fri, 24 Jul 2009 11:41:41 +0200 |
| parents | cf714e75c656 |
| children | 40de4692c860 |
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/cellfun.cc Fri Jul 24 08:13:20 2009 +0200 +++ b/src/DLD-FUNCTIONS/cellfun.cc Fri Jul 24 11:41:41 2009 +0200 @@ -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);