# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1449514441 18000
# Node ID f428cbe7576f916b0f6310d160d593df292d71fa
# Parent  cef0448a6ed21dcf17bf173bfa3668b63d85c8d5
eliminate unnecessary uses of nargin

* __dsearchn__.cc, betainc.cc, bsxfun.cc, data.cc, debug.cc, det.cc,
dot.cc, error.cc, file-io.cc, givens.cc, graphics.cc, hess.cc,
hex2num.cc, input.cc, inv.cc, mgorth.cc, ordschur.cc, pr-output.cc,
profiler.cc, rcond.cc, regexp.cc, sqrtm.cc, sub2ind.cc, sylvester.cc,
syscalls.cc, sysdep.cc, tsearch.cc, urlwrite.cc, utils.cc,
variables.cc:
Don't use nargin variable unless it is used more than once.

diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/__dsearchn__.cc
--- a/libinterp/corefcn/__dsearchn__.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/__dsearchn__.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -40,10 +40,9 @@
 Undocumented internal function.\n\
 @end deftypefn")
 {
-  int nargin = args.length ();
   octave_value_list retval;
 
-  if (nargin != 2)
+  if (args.length () != 2)
     print_usage ();
 
   Matrix x = args(0).matrix_value ().transpose ();
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/betainc.cc
--- a/libinterp/corefcn/betainc.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/betainc.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -67,9 +67,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 3)
+  if (args.length () != 3)
     print_usage ();
 
   octave_value x_arg = args(0);
@@ -302,9 +300,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 3)
+  if (args.length () != 3)
     print_usage ();
 
   octave_value x_arg = args(0);
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/bsxfun.cc
--- a/libinterp/corefcn/bsxfun.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/bsxfun.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -335,10 +335,9 @@
 @seealso{arrayfun, cellfun}\n\
 @end deftypefn")
 {
-  int nargin = args.length ();
   octave_value_list retval;
 
-  if (nargin != 3)
+  if (args.length () != 3)
     print_usage ();
 
   octave_value func = args(0);
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/data.cc
--- a/libinterp/corefcn/data.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/data.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -4507,10 +4507,9 @@
 @seealso{realmax, realmin, intmax, flintmax}\n\
 @end deftypefn")
 {
-  int nargin = args.length ();
   octave_value retval;
 
-  if (nargin == 1 && ! args(0).is_string ())
+  if (args.length () == 1 && ! args(0).is_string ())
     {
       if (args(0).is_single_type ())
         {
@@ -6250,9 +6249,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 0)
+  if (args.length () != 0)
     warning ("tic: ignoring extra arguments");
 
   octave_time now;
@@ -6349,11 +6346,10 @@
 @end deftypefn")
 {
   octave_value_list retval;
-  int nargin = args.length ();
   double usr = 0.0;
   double sys = 0.0;
 
-  if (nargin != 0)
+  if (args.length () != 0)
     warning ("tic: ignoring extra arguments");
 
 #if defined (HAVE_GETRUSAGE)
@@ -7817,9 +7813,8 @@
 @end deftypefn")
 {
   octave_value_list retval;
-  int nargin = args.length ();
-
-  if (nargin != 1)
+
+  if (args.length () != 1)
     print_usage ();
   else
     {
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/debug.cc
--- a/libinterp/corefcn/debug.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/debug.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -196,7 +196,6 @@
 parse_dbfunction_params (const char *who, const octave_value_list& args,
                          std::string& symbol_name, bp_table::intmap& lines)
 {
-  int nargin = args.length ();
   int idx = 0;
   int list_idx = 0;
   symbol_name = std::string ();
@@ -241,7 +240,7 @@
   else
     error ("%s: invalid parameter specified", who);
 
-  for (int i = idx; i < nargin; i++)
+  for (int i = idx; i < args.length (); i++)
     {
       if (args(i).is_string ())
         {
@@ -683,11 +682,9 @@
   std::string symbol_name = "";
   bp_table::intmap lines;
 
-  int nargin = args.length ();
-
   parse_dbfunction_params ("dbclear", args, symbol_name, lines);
 
-  if (nargin == 1 && symbol_name == "all")
+  if (args.length () == 1 && symbol_name == "all")
     bp_table::remove_all_breakpoints ();
   else
     bp_table::remove_breakpoint (symbol_name, lines);
@@ -926,10 +923,9 @@
   octave_value retval;
   octave_user_code *dbg_fcn;
 
-  int nargin = args.length ();
   string_vector argv = args.make_argv ("dbtype");
 
-  switch (nargin)
+  switch (args.length ())
     {
     case 0: // dbtype
       dbg_fcn = get_user_code ();
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/det.cc
--- a/libinterp/corefcn/det.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/det.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -66,9 +66,7 @@
 {
   octave_value_list retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     print_usage ();
 
   octave_value arg = args(0);
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/dot.cc
--- a/libinterp/corefcn/dot.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/dot.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -294,9 +294,8 @@
 @end deftypefn")
 {
   octave_value retval;
-  int nargin = args.length ();
 
-  if (nargin != 2)
+  if (args.length () != 2)
     print_usage ();
 
   octave_value argx = args(0);
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/error.cc
--- a/libinterp/corefcn/error.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/error.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -823,9 +823,7 @@
 
   std::string tstr;
 
-  int nargin = args.length ();
-
-  if (nargin > 0)
+  if (args.length () > 0)
     {
       octave_value arg;
 
@@ -893,9 +891,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     print_usage ();
 
   const octave_scalar_map err = args(0).scalar_map_value ();
@@ -1459,8 +1455,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-  int argc = nargin + 1;
+  int argc = args.length () + 1;
 
   bool done = false;
 
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/file-io.cc
--- a/libinterp/corefcn/file-io.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/file-io.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -711,9 +711,7 @@
 {
   octave_value_list retval;
 
-  int nargin = args.length ();
-
-  if (nargin > 0)
+  if (args.length () > 0)
     warning ("freport: ignoring extra arguments");
 
   octave_stdout << octave_stream_list::list_open_files ();
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/givens.cc
--- a/libinterp/corefcn/givens.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/givens.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -76,9 +76,7 @@
 {
   octave_value_list retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 2 || nargout > 2)
+  if (args.length () != 2 || nargout > 2)
     print_usage ();
 
   if (args(0).is_single_type () || args(1).is_single_type ())
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/graphics.cc
--- a/libinterp/corefcn/graphics.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/graphics.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -9655,9 +9655,7 @@
 @seealso{cla, clf, newplot}\n\
 @end deftypefn")
 {
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     print_usage ();
 
   // get vector of graphics handles
@@ -10139,9 +10137,7 @@
 
   Cell vals;
 
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     print_usage ();
 
   ColumnVector hcv = args(0).xvector_value ("get: H must be a graphics handle");
@@ -10381,9 +10377,7 @@
 {
   gh_manager::auto_lock guard;
 
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     print_usage ();
 
   double h = args(0).xdouble_value ("__calc_dimensions__: first argument must be a graphics handle");
@@ -10668,9 +10662,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     print_usage ();
 
   double h = args(0).xdouble_value ("__image_pixel_size__: argument is not a handle");
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/hess.cc
--- a/libinterp/corefcn/hess.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/hess.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -66,9 +66,7 @@
 {
   octave_value_list retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 1 || nargout > 2)
+  if (args.length () != 1 || nargout > 2)
     print_usage ();
 
   octave_value arg = args(0);
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/hex2num.cc
--- a/libinterp/corefcn/hex2num.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/hex2num.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -66,6 +66,7 @@
 @end deftypefn")
 {
   octave_value retval;
+
   int nargin = args.length ();
 
   if (nargin < 1 || nargin > 2)
@@ -220,9 +221,8 @@
 @end deftypefn")
 {
   octave_value retval;
-  int nargin = args.length ();
 
-  if (nargin != 1)
+  if (args.length () != 1)
     print_usage ();
 
   if (args(0).is_single_type ())
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/input.cc
--- a/libinterp/corefcn/input.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/input.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -709,11 +709,9 @@
 {
   octave_value_list retval;
 
-  int nargin = args.length ();
-
   int read_as_string = 0;
 
-  if (nargin == 2)
+  if (args.length () == 2)
     read_as_string++;
 
   std::string prompt = args(0).xstring_value ("input: unrecognized argument");
@@ -917,9 +915,7 @@
 {
   octave_value_list retval;
 
-  int nargin = args.length ();
-
-  if (nargin > 1)
+  if (args.length () > 1)
     print_usage ();
 
   unwind_protect frame;
@@ -973,11 +969,9 @@
 {
   octave_value_list retval;
 
-  int nargin = args.length ();
-
   string_vector argv = args.make_argv ("echo");
 
-  switch (nargin)
+  switch (args.length ())
     {
     case 0:
       {
@@ -1095,9 +1089,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     print_usage ();
 
   std::string hint = args(0).string_value ();
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/inv.cc
--- a/libinterp/corefcn/inv.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/inv.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -60,9 +60,7 @@
 {
   octave_value_list retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     print_usage ();
 
   octave_value arg = args(0);
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/mgorth.cc
--- a/libinterp/corefcn/mgorth.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/mgorth.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -69,9 +69,7 @@
 {
   octave_value_list retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 2 || nargout > 2)
+  if (args.length () != 2 || nargout > 2)
     print_usage ();
 
   octave_value arg_x = args(0);
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/ordschur.cc
--- a/libinterp/corefcn/ordschur.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/ordschur.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -107,10 +107,9 @@
 @seealso{schur}\n\
 @end deftypefn")
 {
-  int nargin = args.length ();
   octave_value_list retval;
 
-  if (nargin != 3)
+  if (args.length () != 3)
     print_usage ();
 
   const Array<octave_idx_type> sel = args(2).octave_idx_type_vector_value ("ordschur: SELECT must be an array of integers");
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/pr-output.cc
--- a/libinterp/corefcn/pr-output.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/pr-output.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -3508,9 +3508,7 @@
 {
   octave_value_list retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 1 || nargout > 1)
+  if (args.length () != 1 || nargout > 1)
     print_usage ();
 
   octave_value arg = args(0);
@@ -3550,9 +3548,7 @@
 {
   octave_value_list retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 2)
+  if (args.length () != 2)
     print_usage ();
 
   int fid = octave_stream_list::get_file_number (args(0));
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/profiler.cc
--- a/libinterp/corefcn/profiler.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/profiler.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -420,9 +420,8 @@
 @end deftypefn")
 {
   octave_value_list retval;
-  const int nargin = args.length ();
 
-  if (nargin > 0)
+  if (args.length () > 0)
     warning ("profiler_reset: ignoring extra arguments");
 
   profiler.reset ();
@@ -438,9 +437,8 @@
 @end deftypefn")
 {
   octave_value_list retval;
-  const int nargin = args.length ();
 
-  if (nargin > 0)
+  if (args.length () > 0)
     warning ("profiler_data: ignoring extra arguments");
 
   if (nargout > 1)
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/rcond.cc
--- a/libinterp/corefcn/rcond.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/rcond.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -47,9 +47,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     print_usage ();
 
   if (args(0).is_sparse_type ())
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/regexp.cc
--- a/libinterp/corefcn/regexp.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/regexp.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -280,11 +280,9 @@
 parse_options (regexp::opts& options, const octave_value_list& args,
                const std::string& who, int skip, bool& extra_args)
 {
-  int nargin = args.length ();
-
   extra_args = false;
 
-  for (int i = skip; i < nargin; i++)
+  for (int i = skip; i < args.length (); i++)
     {
       std::string str;
 
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/sqrtm.cc
--- a/libinterp/corefcn/sqrtm.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/sqrtm.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -214,9 +214,7 @@
 {
   octave_value_list retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     print_usage ();
 
   octave_value arg = args(0);
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/sub2ind.cc
--- a/libinterp/corefcn/sub2ind.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/sub2ind.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -183,9 +183,7 @@
 {
   octave_value_list retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 2)
+  if (args.length () != 2)
     print_usage ();
 
   dim_vector dv = get_dim_vector (args(0), "ind2sub");
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/sylvester.cc
--- a/libinterp/corefcn/sylvester.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/sylvester.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -62,9 +62,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 3 || nargout > 1)
+  if (args.length () != 3 || nargout > 1)
     print_usage ();
 
   octave_value arg_a = args(0);
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/syscalls.cc
--- a/libinterp/corefcn/syscalls.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/syscalls.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -125,9 +125,7 @@
   retval(1) = std::string ();
   retval(0) = -1;
 
-  int nargin = args.length ();
-
-  if (nargin != 2)
+  if (args.length () != 2)
     print_usage ();
 
   octave_stream old_stream
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/sysdep.cc
--- a/libinterp/corefcn/sysdep.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/sysdep.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -612,9 +612,7 @@
 @seealso{setenv, unsetenv}\n\
 @end deftypefn")
 {
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     print_usage ();
 
   std::string name = args(0).string_value ();
@@ -676,9 +674,7 @@
 @seealso{setenv, getenv}\n\
 @end deftypefn")
 {
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     print_usage ();
 
   std::string tmp = args(0).string_value ();
@@ -950,9 +946,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     print_usage ();
 
   octave_value arg = args(0);
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/tsearch.cc
--- a/libinterp/corefcn/tsearch.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/tsearch.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -74,9 +74,7 @@
 
   const double eps = 1.0e-12;
 
-  const int nargin = args.length ();
-
-  if (nargin != 5)
+  if (args.length () != 5)
     print_usage ();
 
   const ColumnVector x (args(0).vector_value ());
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/urlwrite.cc
--- a/libinterp/corefcn/urlwrite.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/urlwrite.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -561,9 +561,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     error ("__ftp_pwd__: incorrect number of arguments");
   else
     {
@@ -618,9 +616,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     error ("__ftp_dir__: incorrect number of arguments");
   else
     {
@@ -696,9 +692,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     error ("__ftp_ascii__: incorrect number of arguments");
   else
     {
@@ -721,9 +715,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     error ("__ftp_binary__: incorrect number of arguments");
   else
     {
@@ -746,9 +738,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     error ("__ftp_close__: incorrect number of arguments");
   else
     {
@@ -771,9 +761,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     error ("__ftp_mode__: incorrect number of arguments");
   else
     {
@@ -796,9 +784,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 2)
+  if (args.length () != 2)
     error ("__ftp_delete__: incorrect number of arguments");
   else
     {
@@ -825,9 +811,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 2)
+  if (args.length () != 2)
     error ("__ftp_rmdir__: incorrect number of arguments");
   else
     {
@@ -854,9 +838,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 2)
+  if (args.length () != 2)
     error ("__ftp_mkdir__: incorrect number of arguments");
   else
     {
@@ -883,9 +865,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 3)
+  if (args.length () != 3)
     error ("__ftp_rename__: incorrect number of arguments");
   else
     {
@@ -913,9 +893,7 @@
 {
   octave_value retval;
 
-  int nargin = args.length ();
-
-  if (nargin != 2)
+  if (args.length () != 2)
     error ("__ftp_mput__: incorrect number of arguments");
   else
     {
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/utils.cc
--- a/libinterp/corefcn/utils.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/utils.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -101,9 +101,7 @@
 {
   octave_value retval = false;
 
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     print_usage ();
 
   if (args(0).is_string ())
@@ -748,9 +746,7 @@
 @seealso{undo_string_escapes}\n\
 @end deftypefn")
 {
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     print_usage ();
 
   std::string str = args(0).xstring_value ("do_string_escapes: STRING argument must be of type string");
@@ -885,9 +881,7 @@
 @seealso{do_string_escapes}\n\
 @end deftypefn")
 {
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     print_usage ();
 
   std::string str = args(0).xstring_value ("undo_string_escapes: S argument must be a string");
diff -r cef0448a6ed2 -r f428cbe7576f libinterp/corefcn/variables.cc
--- a/libinterp/corefcn/variables.cc	Mon Dec 07 13:26:03 2015 -0500
+++ b/libinterp/corefcn/variables.cc	Mon Dec 07 13:54:01 2015 -0500
@@ -328,9 +328,7 @@
 {
   octave_value retval = false;
 
-  int nargin = args.length ();
-
-  if (nargin != 1)
+  if (args.length () != 1)
     print_usage ();
 
   if (! args(0).is_string ())