Mercurial > octave
changeset 26505:af476ac04cfd stable
fDiagMatrix.cc: Fix static analyzer detected issues (bug #55347).
* fDiagMatrix.cc (FloatDiagMatrix::row (octave_idx_type)): Delete useless
check on "r > c".
* fDiagMatrix.cc (FloatDiagMatrix::row (char *s)): Get first character
with "s[0]" rather than "*s".
* fDiagMatrix.cc (FloatDiagMatrix::column (octave_idx_type)): Delete useless
check on "r < c".
* fDiagMatrix.cc (FloatDiagMatrix::column (char *s)): Get first character
with "s[0]" rather than "*s".
author | Rik <rik@octave.org> |
---|---|
date | Tue, 08 Jan 2019 20:47:49 -0800 |
parents | c7e5fb5c63c9 |
children | 9cf999911dfe |
files | liboctave/array/fDiagMatrix.cc |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/array/fDiagMatrix.cc Tue Jan 08 20:45:19 2019 -0800 +++ b/liboctave/array/fDiagMatrix.cc Tue Jan 08 20:47:49 2019 -0800 @@ -170,7 +170,7 @@ (*current_liboctave_error_handler) ("invalid row selection"); FloatRowVector retval (c, 0.0); - if (r <= c || (r > c && i < c)) + if (r <= c || i < c) retval.elem (i) = elem (i, i); return retval; @@ -182,7 +182,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') @@ -200,7 +200,7 @@ (*current_liboctave_error_handler) ("invalid column selection"); FloatColumnVector retval (r, 0.0); - if (r >= c || (r < c && i < r)) + if (r >= c || i < r) retval.elem (i) = elem (i, i); return retval; @@ -212,7 +212,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')