Mercurial > octave-nkf
diff examples/code/unwinddemo.cc @ 20578:2f8500ca91d3
eliminate error_state from example files
* addtwomatrices.cc, celldemo.cc, embedded.cc, fortrandemo.cc,
funcdemo.cc, globaldemo.cc, helloworld.cc, make_int.cc, paramdemo.cc,
stringdemo.cc, structdemo.cc, unwinddemo.cc:
Eliminate use of global error_state variable.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 03 Oct 2015 16:05:27 -0400 |
| parents | 95c533ed464b |
| children |
line wrap: on
line diff
--- a/examples/code/unwinddemo.cc Sat Oct 03 13:20:28 2015 -0400 +++ b/examples/code/unwinddemo.cc Sat Oct 03 16:05:27 2015 -0400 @@ -15,33 +15,23 @@ DEFUN_DLD (unwinddemo, args, nargout, "Unwind Demo") { - octave_value retval; - int nargin = args.length (); - - if (nargin < 2) + if (args.length () < 2) print_usage (); - else - { - NDArray a = args(0).array_value (); - NDArray b = args(1).array_value (); + + NDArray a = args(0).array_value (); + NDArray b = args(1).array_value (); - if (! error_state) - { - // Declare unwind_protect frame which lasts as long as - // the variable frame has scope. - unwind_protect frame; - frame.add_fcn (set_liboctave_warning_handler, - current_liboctave_warning_handler); + // Declare unwind_protect frame which lasts as long as + // the variable frame has scope. + unwind_protect frame; + frame.add_fcn (set_liboctave_warning_handler, + current_liboctave_warning_handler); - frame.add_fcn (set_liboctave_warning_with_id_handler, - current_liboctave_warning_with_id_handler); - - set_liboctave_warning_handler (my_err_handler); - set_liboctave_warning_with_id_handler (my_err_with_id_handler); + frame.add_fcn (set_liboctave_warning_with_id_handler, + current_liboctave_warning_with_id_handler); - retval = octave_value (quotient (a, b)); - } - } + set_liboctave_warning_handler (my_err_handler); + set_liboctave_warning_with_id_handler (my_err_with_id_handler); - return retval; + return octave_value (quotient (a, b)); }