Mercurial > octave

changeset 26502:dfc8d79cc28b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CDiagMatrix.cc: Fix static analyzer detected issues (bug #55347). * CDiagMatrix.cc (ComplexDiagMatrix::row (octave_idx_type)): Delete useless check on "r > c". * CDiagMatrix.cc (ComplexDiagMatrix::row (char *s)): Get first character with "s[0]" rather than "*s". * CDiagMatrix.cc (ComplexDiagMatrix::column (octave_idx_type)): Delete useless check on "r < c". * CDiagMatrix.cc (ComplexDiagMatrix::column (char *s)): Get first character with "s[0]" rather than "*s".
author Rik <rik@octave.org>
date Tue, 08 Jan 2019 17:29:09 -0800
parents cfe28edab48b
children a534d1be2aa0
files liboctave/array/CDiagMatrix.cc
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/array/CDiagMatrix.cc	Tue Jan 08 17:13:20 2019 -0800
+++ b/liboctave/array/CDiagMatrix.cc	Tue Jan 08 17:29:09 2019 -0800
@@ -247,7 +247,7 @@
     (*current_liboctave_error_handler) ("invalid row selection");
 
   ComplexRowVector retval (c, 0.0);
-  if (r <= c || (r > c && i < c))
+  if (r <= c || i < c)
     retval.elem (i) = elem (i, i);
 
   return retval;
@@ -259,7 +259,7 @@
   if (! s)
     (*current_liboctave_error_handler) ("invalid row selection");
 
-  char c = *s;
+  char c = s[0];
   if (c == 'f' || c == 'F')
     return row (static_cast<octave_idx_type> (0));
   else if (c == 'l' || c == 'L')
@@ -277,7 +277,7 @@
     (*current_liboctave_error_handler) ("invalid column selection");
 
   ComplexColumnVector retval (r, 0.0);
-  if (r >= c || (r < c && i < r))
+  if (r >= c || i < r)
     retval.elem (i) = elem (i, i);
 
   return retval;
@@ -289,7 +289,7 @@
   if (! s)
     (*current_liboctave_error_handler) ("invalid column selection");
 
-  char c = *s;
+  char c = s[0];
   if (c == 'f' || c == 'F')
     return column (static_cast<octave_idx_type> (0));
   else if (c == 'l' || c == 'L')