changeset 21121:f5b17eb2508b

maint: Remove unused variables. * data.cc (Fissorted): Remove "octave_value mode_arg". * error.cc (Ferror): Remove "octave_value_list tmp". * gl2ps-renderer.cc (gl2ps_renderer::draw_text): Comment out "Matrix bbox". * graphics.cc (base_properties::get_dynamic): Remove "octave_value retval". * graphics.cc (Faddproperty): Remove "octave_value retval". * regexp.cc (octregexprep): Remove "octave_value retval". * sparse-xpow.cc (elem_xpow): Remove "Complex tmp". * symtab.cc (symbol_table::fcn_info::fcn_info_rep::find_autoload): Remove "octave_value retval". * urlwrite.cc (__ftp_mode__): Remove "octave_value retval". * xpow.cc (xpow (const DiagMatrix& a, double b)): Remove "octave_value retval". * symrcm.cc (Fsymrcm): Remove "octave_value retval". * ov-cell.cc (Fcellstr): Remove "octave_value retval". * ov-classdef.cc (cdef_object::map_value): Remove "octave_value pvalue". * ov-struct.cc (octave_scalar_struct::load_binary): Remove "dim_vector dv (1, 1)" * ov-struct.cc (Fstruct): Remove "Cell fields" ov.cc (octave_value::assign): Remove "octave_value retval". * pt-classdef.cc (tree_classdef_body::~tree_classdef_body): Remove "octave_value retval". * pt-eval.cc (tree_evaluator::visit_statement_list): Comment out "static octave_value_list empty_list". * DASRT.cc (DASRT::integrate): Remove "DASRT_result retval". * sparse-base-chol.cc (sparse_base_chol<>): Remove "chol_type ret".
author Rik <rik@octave.org>
date Wed, 20 Jan 2016 20:57:45 -0800
parents 499b851fbfae
children dba88797f69f
files libinterp/corefcn/data.cc libinterp/corefcn/error.cc libinterp/corefcn/gl2ps-renderer.cc libinterp/corefcn/graphics.cc libinterp/corefcn/regexp.cc libinterp/corefcn/sparse-xpow.cc libinterp/corefcn/symtab.cc libinterp/corefcn/urlwrite.cc libinterp/corefcn/xpow.cc libinterp/dldfcn/symrcm.cc libinterp/octave-value/ov-cell.cc libinterp/octave-value/ov-classdef.cc libinterp/octave-value/ov-struct.cc libinterp/octave-value/ov.cc libinterp/parse-tree/pt-classdef.cc libinterp/parse-tree/pt-eval.cc liboctave/numeric/DASRT.cc liboctave/numeric/sparse-base-chol.cc
diffstat 18 files changed, 3 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/data.cc	Wed Jan 20 16:58:59 2016 -0800
+++ b/libinterp/corefcn/data.cc	Wed Jan 20 20:57:45 2016 -0800
@@ -6765,8 +6765,6 @@
 
   if (nargin > 1)
     {
-      octave_value mode_arg;
-
       if (nargin == 3)
         smode = get_sort_mode_option (args(2));
 
--- a/libinterp/corefcn/error.cc	Wed Jan 20 16:58:59 2016 -0800
+++ b/libinterp/corefcn/error.cc	Wed Jan 20 20:57:45 2016 -0800
@@ -1172,8 +1172,6 @@
       if (args(0).is_empty ())
         return retval;
 
-      octave_value_list tmp;
-
       octave_scalar_map m = args(0).scalar_map_value ();
 
       // empty struct is not an error.  return and resume calling function.
--- a/libinterp/corefcn/gl2ps-renderer.cc	Wed Jan 20 16:58:59 2016 -0800
+++ b/libinterp/corefcn/gl2ps-renderer.cc	Wed Jan 20 20:57:45 2016 -0800
@@ -616,8 +616,8 @@
     valign = 1;
 
   // FIXME: handle margin and surrounding box
+  // Matrix bbox;
 
-  Matrix bbox;
   const Matrix pos = get_transform ().scale (props.get_data_position ());
   std::string str = props.get_string ().string_vector_value ().join ("\n");
 
--- a/libinterp/corefcn/graphics.cc	Wed Jan 20 16:58:59 2016 -0800
+++ b/libinterp/corefcn/graphics.cc	Wed Jan 20 20:57:45 2016 -0800
@@ -2903,8 +2903,6 @@
 octave_value
 base_properties::get_dynamic (const caseless_str& pname) const
 {
-  octave_value retval;
-
   std::map<caseless_str, property, cmp_caseless_str>::const_iterator it =
     all_props.find (pname);
 
@@ -11041,8 +11039,6 @@
 {
   gh_manager::auto_lock guard;
 
-  octave_value retval;
-
   if (args.length () < 3)
     print_usage ();
 
--- a/libinterp/corefcn/regexp.cc	Wed Jan 20 16:58:59 2016 -0800
+++ b/libinterp/corefcn/regexp.cc	Wed Jan 20 20:57:45 2016 -0800
@@ -1290,8 +1290,6 @@
 static octave_value
 octregexprep (const octave_value_list &args, const std::string &who)
 {
-  octave_value retval;
-
   int nargin = args.length ();
 
   // Make sure we have string, pattern, replacement
--- a/libinterp/corefcn/sparse-xpow.cc	Wed Jan 20 16:58:59 2016 -0800
+++ b/libinterp/corefcn/sparse-xpow.cc	Wed Jan 20 20:57:45 2016 -0800
@@ -670,7 +670,6 @@
         {
           octave_quit ();
           double btmp = b(a.ridx (i), j);
-          Complex tmp;
 
           if (xisint (btmp))
             result.xelem (a.ridx (i), j) = std::pow (a.data (i),
--- a/libinterp/corefcn/symtab.cc	Wed Jan 20 16:58:59 2016 -0800
+++ b/libinterp/corefcn/symtab.cc	Wed Jan 20 20:57:45 2016 -0800
@@ -1042,8 +1042,6 @@
 octave_value
 symbol_table::fcn_info::fcn_info_rep::find_autoload (void)
 {
-  octave_value retval;
-
   // Autoloaded function.
 
   if (autoload_function.is_defined ())
--- a/libinterp/corefcn/urlwrite.cc	Wed Jan 20 16:58:59 2016 -0800
+++ b/libinterp/corefcn/urlwrite.cc	Wed Jan 20 20:57:45 2016 -0800
@@ -698,8 +698,6 @@
   if (args.length () != 1)
     error ("__ftp_mode__: incorrect number of arguments");
 
-  octave_value retval;
-
   url_transfer curl = ch_manager::get_object (args(0));
 
   if (! curl.is_valid ())
--- a/libinterp/corefcn/xpow.cc	Wed Jan 20 16:58:59 2016 -0800
+++ b/libinterp/corefcn/xpow.cc	Wed Jan 20 20:57:45 2016 -0800
@@ -309,7 +309,6 @@
 octave_value
 xpow (const PermMatrix& a, double b)
 {
-  octave_value retval;
   int btmp = static_cast<int> (b);
   if (btmp == b)
     return a.power (btmp);
--- a/libinterp/dldfcn/symrcm.cc	Wed Jan 20 16:58:59 2016 -0800
+++ b/libinterp/dldfcn/symrcm.cc	Wed Jan 20 20:57:45 2016 -0800
@@ -440,8 +440,6 @@
   if (args.length () != 1)
     print_usage ();
 
-  octave_value retval;
-
   octave_value arg = args(0);
 
   // the parameter of the matrix is converted into a sparse matrix
--- a/libinterp/octave-value/ov-cell.cc	Wed Jan 20 16:58:59 2016 -0800
+++ b/libinterp/octave-value/ov-cell.cc	Wed Jan 20 20:57:45 2016 -0800
@@ -1266,8 +1266,6 @@
   if (args.length () != 1)
     print_usage ();
 
-  octave_value retval;
-
   octave_value_list tmp = Fiscellstr (args, 1);
 
   if (tmp(0).is_true ())
--- a/libinterp/octave-value/ov-classdef.cc	Wed Jan 20 16:58:59 2016 -0800
+++ b/libinterp/octave-value/ov-classdef.cc	Wed Jan 20 20:57:45 2016 -0800
@@ -1259,8 +1259,6 @@
       for (std::map<std::string, cdef_property>::iterator it = props.begin ();
            it != props.end (); ++it)
         {
-          octave_value pvalue;
-
           if (is_array ())
             {
               Array<cdef_object> a_obj = array_value ();
--- a/libinterp/octave-value/ov-struct.cc	Wed Jan 20 16:58:59 2016 -0800
+++ b/libinterp/octave-value/ov-struct.cc	Wed Jan 20 20:57:45 2016 -0800
@@ -1434,8 +1434,6 @@
   if (swap)
     swap_bytes<4> (&len);
 
-  dim_vector dv (1, 1);
-
   if (len > 0)
     {
       octave_scalar_map m;
@@ -1699,8 +1697,6 @@
   if ((nargin == 1 || nargin == 2)
       && args(0).is_empty () && args(0).is_real_matrix ())
     {
-      Cell fields;
-
       if (nargin == 2)
         {
           Array<std::string> cstr = args(1).xcellstr_value ("struct: second argument should be a cell array of field names");
--- a/libinterp/octave-value/ov.cc	Wed Jan 20 16:58:59 2016 -0800
+++ b/libinterp/octave-value/ov.cc	Wed Jan 20 20:57:45 2016 -0800
@@ -1412,8 +1412,6 @@
                       const std::list<octave_value_list>& idx,
                       const octave_value& rhs)
 {
-  octave_value retval;
-
   make_unique ();
 
   octave_value t_rhs = rhs;
--- a/libinterp/parse-tree/pt-classdef.cc	Wed Jan 20 16:58:59 2016 -0800
+++ b/libinterp/parse-tree/pt-classdef.cc	Wed Jan 20 20:57:45 2016 -0800
@@ -235,7 +235,6 @@
 octave_function*
 tree_classdef::make_meta_class (bool is_at_folder)
 {
-  octave_value retval;
   cdef_class cls = cdef_class::make_meta_class (this, is_at_folder);
 
   if (cls.ok ())
--- a/libinterp/parse-tree/pt-eval.cc	Wed Jan 20 16:58:59 2016 -0800
+++ b/libinterp/parse-tree/pt-eval.cc	Wed Jan 20 20:57:45 2016 -0800
@@ -731,7 +731,8 @@
 void
 tree_evaluator::visit_statement_list (tree_statement_list& lst)
 {
-  static octave_value_list empty_list;
+  // FIXME: commented out along with else clause below. 
+  // static octave_value_list empty_list;
 
   tree_statement_list::iterator p = lst.begin ();
 
--- a/liboctave/numeric/DASRT.cc	Wed Jan 20 16:58:59 2016 -0800
+++ b/liboctave/numeric/DASRT.cc	Wed Jan 20 20:57:45 2016 -0800
@@ -153,8 +153,6 @@
 void
 DASRT::integrate (double tout)
 {
-  DASRT_result retval;
-
   // I suppose this is the safe thing to do.  If this is the first
   // call, or if anything about the problem has changed, we should
   // start completely fresh.
--- a/liboctave/numeric/sparse-base-chol.cc	Wed Jan 20 16:58:59 2016 -0800
+++ b/liboctave/numeric/sparse-base-chol.cc	Wed Jan 20 20:57:45 2016 -0800
@@ -276,7 +276,6 @@
   cholmod_sparse *m = rep->L ();
   octave_idx_type n = m->ncol;
   ColumnVector perms = rep->perm ();
-  chol_type ret;
   double rcond2;
   octave_idx_type info;
   MatrixType mattype (MatrixType::Upper);