Mercurial > hg > octave-nkf
diff liboctave/chMatrix.cc @ 11265:a117dc8ea1b9
charMatrix::row_as_string: never strip trailing nul characters
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 18 Nov 2010 03:30:53 -0500 |
parents | 4d1fc073fbb7 |
children | fd0a3ac60b0e |
line wrap: on
line diff
--- a/liboctave/chMatrix.cc +++ b/liboctave/chMatrix.cc @@ -131,7 +131,7 @@ } std::string -charMatrix::row_as_string (octave_idx_type r, bool strip_ws, bool raw) const +charMatrix::row_as_string (octave_idx_type r, bool strip_ws) const { std::string retval; @@ -152,22 +152,13 @@ for (octave_idx_type i = 0; i < nc; i++) retval[i] = elem (r, i); - if (! raw) + if (strip_ws) { - if (strip_ws) + while (--nc >= 0) { - while (--nc >= 0) - { - char c = retval[nc]; - if (c && c != ' ') - break; - } - } - else - { - while (--nc >= 0) - if (retval[nc]) - break; + char c = retval[nc]; + if (c && c != ' ') + break; } retval.resize (nc+1);