Mercurial > octave
diff libinterp/corefcn/rand.cc @ 20831:35241c4b696c
eliminate return statements after calls to error
* Cell.cc, __ichol__.cc, __lin_interpn__.cc, __pchip_deriv__.cc,
besselj.cc, cellfun.cc, colloc.cc, debug.cc, dlmread.cc,
dynamic-ld.cc, filter.cc, find.cc, gl2ps-renderer.cc, load-path.cc,
load-save.cc, ls-mat4.cc, ls-mat5.cc, ls-oct-text.cc, luinc.cc,
max.cc, nproc.cc, oct-hist.cc, oct-map.cc, oct-obj.cc, oct-stream.cc,
ordschur.cc, pinv.cc, pr-output.cc, profiler.cc, psi.cc, quadcc.cc,
qz.cc, rand.cc, strfind.cc, strfns.cc, sysdep.cc, toplev.cc, tril.cc,
typecast.cc, urlwrite.cc, utils.cc, variables.cc: Eliminate return
statements after calls to error.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 09 Dec 2015 14:00:43 -0500 |
| parents | a542a9bf177e |
| children | 1142cf6abc0d |
line wrap: on
line diff
--- a/libinterp/corefcn/rand.cc Tue Dec 08 17:41:32 2015 -0800 +++ b/libinterp/corefcn/rand.cc Wed Dec 09 14:00:43 2015 -0500 @@ -86,10 +86,7 @@ if (additional_arg) { if (nargin == 0) - { - error ("%s: at least one argument is required", fcn); - goto done; - } + error ("%s: at least one argument is required", fcn); else if (args(0).is_string ()) additional_arg = false; else @@ -166,9 +163,7 @@ double dval = tmp.double_value (); if (xisnan (dval)) - { - error ("%s: NaN is invalid matrix dimension", fcn); - } + error ("%s: NaN is invalid matrix dimension", fcn); else { dims.resize (2); @@ -314,10 +309,8 @@ else { if (a.dims () != dims) - { - error ("%s: mismatch in argument size", fcn); - return retval; - } + error ("%s: mismatch in argument size", fcn); + octave_idx_type len = a.numel (); FloatNDArray m (dims); float *v = m.fortran_vec (); @@ -338,10 +331,8 @@ else { if (a.dims () != dims) - { - error ("%s: mismatch in argument size", fcn); - return retval; - } + error ("%s: mismatch in argument size", fcn); + octave_idx_type len = a.numel (); NDArray m (dims); double *v = m.fortran_vec ();