Mercurial > octave
changeset 21078:49852ff04747
maint: Remove unnecessary declarations of retval.
* __pchip_deriv__.cc, data.cc, dirfns.cc, error.cc, file-io.cc, input.cc,
load-path.cc, octave-link.cc, strfns.cc, sysdep.cc, time.cc, toplev.cc,
urlwrite.cc, ov-cell.cc, ov.cc: Remove unnecessary declarations of retval.
| author | Rik <rik@octave.org> |
|---|---|
| date | Fri, 15 Jan 2016 13:40:34 -0800 |
| parents | 40f931a63a91 |
| children | 706dcaf7bf5f |
| files | libinterp/corefcn/__pchip_deriv__.cc libinterp/corefcn/data.cc libinterp/corefcn/dirfns.cc libinterp/corefcn/error.cc libinterp/corefcn/file-io.cc libinterp/corefcn/input.cc libinterp/corefcn/load-path.cc libinterp/corefcn/octave-link.cc libinterp/corefcn/strfns.cc libinterp/corefcn/sysdep.cc libinterp/corefcn/time.cc libinterp/corefcn/toplev.cc libinterp/corefcn/urlwrite.cc libinterp/octave-value/ov-cell.cc libinterp/octave-value/ov.cc |
| diffstat | 15 files changed, 29 insertions(+), 73 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/__pchip_deriv__.cc Fri Jan 15 10:52:48 2016 -0800 +++ b/libinterp/corefcn/__pchip_deriv__.cc Fri Jan 15 13:40:34 2016 -0800 @@ -57,7 +57,7 @@ @end deftypefn") { octave_value retval; - const int nargin = args.length (); + int nargin = args.length (); bool rows = (nargin == 3 && args(2).uint_value () == 2);
--- a/libinterp/corefcn/data.cc Fri Jan 15 10:52:48 2016 -0800 +++ b/libinterp/corefcn/data.cc Fri Jan 15 13:40:34 2016 -0800 @@ -404,13 +404,13 @@ @end example\n\ @end deftypefn") { - octave_value retval; - int nargin = args.length (); if (nargin < 2) print_usage (); + octave_value retval; + if (nargin == 2) retval = do_hypot (args(0), args(1)); else @@ -2837,12 +2837,8 @@ @seealso{size, numel, ndims}\n\ @end deftypefn") { - octave_value retval; - int nargin = args.length (); - retval = true; - if (nargin >= 1) { dim_vector a_dims = args(0).dims (); @@ -2852,14 +2848,11 @@ dim_vector b_dims = args(i).dims (); if (a_dims != b_dims) - { - retval = false; - break; - } + return ovl (false); } } - return retval; + return ovl (true); } DEFUN (nnz, args, , @@ -6220,13 +6213,11 @@ @seealso{toc, cputime}\n\ @end deftypefn") { - octave_value retval; - if (args.length () != 0) warning ("tic: ignoring extra arguments"); + octave_value retval; octave_time now; - double tmp = now.double_value (); if (nargout > 0) @@ -6315,13 +6306,12 @@ @seealso{tic, toc}\n\ @end deftypefn") { - octave_value_list retval; + if (args.length () != 0) + warning ("cputime: ignoring extra arguments"); + double usr = 0.0; double sys = 0.0; - if (args.length () != 0) - warning ("tic: ignoring extra arguments"); - #if defined (HAVE_GETRUSAGE) struct rusage ru; @@ -6360,9 +6350,7 @@ #endif - retval = ovl (sys + usr, usr, sys); - - return retval; + return ovl (sys + usr, usr, sys); } DEFUN (sort, args, nargout,
--- a/libinterp/corefcn/dirfns.cc Fri Jan 15 10:52:48 2016 -0800 +++ b/libinterp/corefcn/dirfns.cc Fri Jan 15 13:40:34 2016 -0800 @@ -523,8 +523,9 @@ @deftypefn {} {} fnmatch (@var{pattern}, @var{string})\n\ Return true or false for each element of @var{string} that matches any of\n\ the elements of the string array @var{pattern}, using the rules of\n\ +filename pattern matching.\n\ \n\ -filename pattern matching. For example:\n\ +For example:\n\ \n\ @example\n\ @group\n\ @@ -535,8 +536,6 @@ @seealso{glob, regexp}\n\ @end deftypefn") { - octave_value retval; - if (args.length () != 2) print_usage (); @@ -545,7 +544,7 @@ glob_match pattern (file_ops::tilde_expand (pat)); - return octave_value (pattern.match (str)); + return ovl (pattern.match (str)); } DEFUN (filesep, args, ,
--- a/libinterp/corefcn/error.cc Fri Jan 15 10:52:48 2016 -0800 +++ b/libinterp/corefcn/error.cc Fri Jan 15 13:40:34 2016 -0800 @@ -891,8 +891,6 @@ @seealso{lasterror, lasterr, error}\n\ @end deftypefn") { - octave_value retval; - if (args.length () != 1) print_usage (); @@ -1014,7 +1012,7 @@ } } - return retval; + return ovl (); } // Determine whether the first argument to error or warning function @@ -2054,9 +2052,8 @@ to check for the proper number of arguments.\n\ @end deftypefn") { - octave_value_list retval; handle_message (usage_with_id, "", "unknown", args, true); - return retval; + return ovl (); } DEFUN (beep_on_error, args, nargout,
--- a/libinterp/corefcn/file-io.cc Fri Jan 15 10:52:48 2016 -0800 +++ b/libinterp/corefcn/file-io.cc Fri Jan 15 13:40:34 2016 -0800 @@ -677,14 +677,12 @@ @seealso{fopen, fclose, is_valid_file_id}\n\ @end deftypefn") { - octave_value_list retval; - if (args.length () > 0) warning ("freport: ignoring extra arguments"); octave_stdout << octave_stream_list::list_open_files (); - return retval; + return ovl (); } DEFUN (frewind, args, nargout,
--- a/libinterp/corefcn/input.cc Fri Jan 15 10:52:48 2016 -0800 +++ b/libinterp/corefcn/input.cc Fri Jan 15 13:40:34 2016 -0800 @@ -963,8 +963,6 @@ With no arguments, @code{echo} toggles the current echo state.\n\ @end deftypefn") { - octave_value_list retval; - string_vector argv = args.make_argv (); switch (args.length ())
--- a/libinterp/corefcn/load-path.cc Fri Jan 15 10:52:48 2016 -0800 +++ b/libinterp/corefcn/load-path.cc Fri Jan 15 13:40:34 2016 -0800 @@ -2287,11 +2287,9 @@ Reinitialize Octave's load path directory cache.\n\ @end deftypefn") { - octave_value_list retval; - rehash_internal (); - return retval; + return ovl (); } DEFUN (command_line_path, , ,
--- a/libinterp/corefcn/octave-link.cc Fri Jan 15 10:52:48 2016 -0800 +++ b/libinterp/corefcn/octave-link.cc Fri Jan 15 13:40:34 2016 -0800 @@ -109,7 +109,7 @@ Undocumented internal function.\n\ @end deftypefn") { - return octave_value (octave_link::enabled ()); + return ovl (octave_link::enabled ()); } DEFUN (__octave_link_edit_file__, args, , @@ -375,7 +375,7 @@ Undocumented internal function.\n\ @end deftypefn") { - return octave_value (octave_link::show_preferences ()); + return ovl (octave_link::show_preferences ()); } DEFUN (__octave_link_show_doc__, args, , @@ -389,6 +389,6 @@ if (args.length () >= 1) file = args(0).string_value(); - return octave_value (octave_link::show_doc (file)); + return ovl (octave_link::show_doc (file)); }
--- a/libinterp/corefcn/strfns.cc Fri Jan 15 10:52:48 2016 -0800 +++ b/libinterp/corefcn/strfns.cc Fri Jan 15 13:40:34 2016 -0800 @@ -201,8 +201,6 @@ @seealso{char, strcat, cstrcat}\n\ @end deftypefn") { - octave_value retval; - int nargin = args.length (); int n_elts = 0; size_t max_len = 0; @@ -261,9 +259,7 @@ } } - retval = octave_value (result, '\''); - - return retval; + return octave_value (result, '\''); } /*
--- a/libinterp/corefcn/sysdep.cc Fri Jan 15 10:52:48 2016 -0800 +++ b/libinterp/corefcn/sysdep.cc Fri Jan 15 13:40:34 2016 -0800 @@ -191,13 +191,13 @@ Undocumented internal function.\n\ @end deftypefn") { - octave_value retval; - if (args.length () != 1) print_usage (); std::string file = args(0).xstring_value ("__open_with_system_app__: argument must be a filename"); + octave_value retval; + #if defined (__WIN32__) && ! defined (_POSIX_VERSION) HINSTANCE status = ShellExecute (0, 0, file.c_str (), 0, 0, SW_SHOWNORMAL); @@ -642,8 +642,6 @@ @seealso{unsetenv, getenv}\n\ @end deftypefn") { - octave_value_list retval; - int nargin = args.length (); if (nargin < 1 || nargin > 2) @@ -657,7 +655,7 @@ octave_env::putenv (var, val); - return retval; + return ovl (); } DEFALIAS (putenv, setenv); @@ -740,7 +738,7 @@ retval = s; } - return ovl (); + return retval; } DEFUN (pause, args, ,
--- a/libinterp/corefcn/time.cc Fri Jan 15 10:52:48 2016 -0800 +++ b/libinterp/corefcn/time.cc Fri Jan 15 13:40:34 2016 -0800 @@ -440,8 +440,6 @@ @seealso{strptime, localtime, gmtime, mktime, time, now, date, clock, datenum, datestr, datevec, calendar, weekday}\n\ @end deftypefn") { - octave_value retval; - if (args.length () != 2) print_usage ();
--- a/libinterp/corefcn/toplev.cc Fri Jan 15 10:52:48 2016 -0800 +++ b/libinterp/corefcn/toplev.cc Fri Jan 15 13:40:34 2016 -0800 @@ -828,13 +828,11 @@ @seealso{atexit}\n\ @end deftypefn") { - octave_value_list retval; - // Confirm OK to shutdown. Note: A dynamic function installation similar // to overriding polymorphism for which the GUI can install its own "quit" // yet call this base "quit" could be nice. No link would be needed here. if (! octave_link::confirm_shutdown ()) - return retval; + return ovl (); if (! quit_allowed) error ("quit: not supported in embedded mode"); @@ -858,7 +856,7 @@ octave_throw_interrupt_exception (); - return retval; + return ovl (); } DEFALIAS (exit, quit); @@ -869,8 +867,6 @@ Describe the conditions for copying and distributing Octave.\n\ @end deftypefn") { - octave_value_list retval; - octave_stdout << "\n" << octave_name_version_and_copyright () << "\n\ \n\ GNU Octave is free software; you can redistribute it and/or modify\n\ @@ -887,7 +883,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.\n\ \n"; - return retval; + return ovl (); } // Execute a shell command.
--- a/libinterp/corefcn/urlwrite.cc Fri Jan 15 10:52:48 2016 -0800 +++ b/libinterp/corefcn/urlwrite.cc Fri Jan 15 13:40:34 2016 -0800 @@ -735,8 +735,6 @@ Undocumented internal function\n\ @end deftypefn") { - octave_value retval; - if (args.length () != 2) error ("__ftp_rmdir__: incorrect number of arguments");
--- a/libinterp/octave-value/ov-cell.cc Fri Jan 15 10:52:48 2016 -0800 +++ b/libinterp/octave-value/ov-cell.cc Fri Jan 15 13:40:34 2016 -0800 @@ -1201,8 +1201,6 @@ @seealso{cellstr, mat2cell, num2cell, struct2cell}\n\ @end deftypefn") { - octave_value retval; - int nargin = args.length (); dim_vector dims; @@ -1232,9 +1230,7 @@ check_dimensions (dims, "cell"); - retval = Cell (dims, Matrix ()); - - return retval; + return ovl (Cell (dims, Matrix ())); } DEFUN (iscellstr, args, ,
--- a/libinterp/octave-value/ov.cc Fri Jan 15 10:52:48 2016 -0800 +++ b/libinterp/octave-value/ov.cc Fri Jan 15 13:40:34 2016 -0800 @@ -3014,8 +3014,6 @@ @seealso{subsasgn, substruct}\n\ @end deftypefn") { - octave_value_list retval; - if (args.length () != 2) print_usage (); @@ -3030,8 +3028,6 @@ return ovl (arg0); else return arg0.subsref (type, idx, nargout); - - return retval; } DEFUN (subsasgn, args, ,