Mercurial > octave
diff libinterp/corefcn/file-io.cc @ 29163:8f67ad8b3103
maint: Updating naming conventions for exceptions and use const where possible.
* GLCanvas.cc, interpreter-qobject.cc, file-editor-tab.cc,
octave-qscintilla.cc, octave-qobject.cc, Cell.cc, __eigs__.cc,
__magick_read__.cc, __qp__.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
file-io.cc, graphics.cc, graphics.in.h, input.cc, interpreter.cc,
ls-mat-ascii.cc, lsode.cc, oct-handle.h, oct-map.cc, quad.cc, rand.cc,
sparse.cc, sub2ind.cc, toplev.cc, utils.cc, __init_gnuplot__.cc, __ode15__.cc,
cdef-object.cc, ov-base-diag.cc, ov-base-mat.cc, ov-base-sparse.cc,
ov-base.cc, ov-fcn-handle.cc, ov-java.cc, ov-perm.cc, ov-range.cc,
ov-re-diag.cc, ov-str-mat.cc, ov.cc, pt-assign.cc, pt-eval.cc, pt-idx.cc,
pt-jit.cc, pt.cc, Array-util.cc, randmtzig.cc:
Update naming conventions for exceptions to use initial letter of exception
type. For example, "execution_exception" is named "ee", "index_exception" is
"ie". Catch "const" exceptions where possible.
* gzip.cc: Add block to catch and throw interrupt_exceptions before having
a catch block "(...)" for everything else.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 08 Dec 2020 13:25:03 -0800 |
| parents | 10a35049bad7 |
| children | 7854d5752dd2 |
line wrap: on
line diff
--- a/libinterp/corefcn/file-io.cc Tue Dec 08 21:34:55 2020 +0100 +++ b/libinterp/corefcn/file-io.cc Tue Dec 08 13:25:03 2020 -0800 @@ -2384,9 +2384,9 @@ oct_data_conv::string_to_data_type (prec, block_size, input_type, output_type); } - catch (octave::execution_exception& e) + catch (octave::execution_exception& ee) { - error (e, "fread: invalid PRECISION specified"); + error (ee, "fread: invalid PRECISION specified"); } int skip = 0; @@ -2395,9 +2395,9 @@ { skip = skip_arg.int_value (true); } - catch (octave::execution_exception& e) + catch (octave::execution_exception& ee) { - error (e, "fread: SKIP must be an integer"); + error (ee, "fread: SKIP must be an integer"); } std::string arch = arch_arg.xstring_value ("fread: ARCH architecture type must be a string"); @@ -2620,9 +2620,9 @@ { oct_data_conv::string_to_data_type (prec, block_size, output_type); } - catch (octave::execution_exception& e) + catch (octave::execution_exception& ee) { - error (e, "fwrite: invalid PRECISION specified"); + error (ee, "fwrite: invalid PRECISION specified"); } int skip = 0; @@ -2631,9 +2631,9 @@ { skip = skip_arg.int_value (true); } - catch (octave::execution_exception& e) + catch (octave::execution_exception& ee) { - error (e, "fwrite: SKIP must be an integer"); + error (ee, "fwrite: SKIP must be an integer"); } std::string arch = arch_arg.xstring_value ("fwrite: ARCH architecture type must be a string");