Mercurial > hg > octave-nkf
diff src/oct-stream.cc @ 11586:12df7854fa7c
strip trailing whitespace from source files
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 20 Jan 2011 17:24:59 -0500 |
parents | a83bad07f7e3 |
children | b74cb659e757 fb69561e5901 |
line wrap: on
line diff
--- a/src/oct-stream.cc +++ b/src/oct-stream.cc @@ -240,7 +240,7 @@ { scanf_format_elt *elt = list(i); delete elt; - } + } } void @@ -668,7 +668,7 @@ { printf_format_elt *elt = list(i); delete elt; - } + } } void @@ -922,7 +922,7 @@ { ::error ("%s: unable to read from stdin while running interactively", who.c_str ()); - + return retval; } @@ -1036,7 +1036,7 @@ { ::error ("%s: unable to read from stdin while running interactively", who.c_str ()); - + return count; } @@ -1174,7 +1174,7 @@ return is; } -// Note that this specialization is only used for reading characters, not +// Note that this specialization is only used for reading characters, not // character strings. See BEGIN_S_CONVERSION for details. template<> @@ -1389,7 +1389,7 @@ do_scanf_conv (std::istream& is, const scanf_format_elt& fmt, T valptr, Matrix& mval, double *data, octave_idx_type& idx, octave_idx_type& conversion_count, octave_idx_type nr, octave_idx_type max_size, - bool discard) + bool discard) { OCTAVE_SCAN (is, fmt, valptr); @@ -1671,7 +1671,7 @@ { ::error ("%s: unable to read from stdin while running interactively", who.c_str ()); - + return retval; } @@ -2614,7 +2614,7 @@ int nsa = (elt->fw < 0) + (elt->prec < 0); int sa_1 = 0; - int sa_2 = 0; + int sa_2 = 0; if (nsa > 0) { @@ -2645,7 +2645,7 @@ { os << elt->text; retval += strlen (elt->text); - } + } else if (elt->type == 's') { std::string val = val_cache.string_value (); @@ -2735,7 +2735,7 @@ if (! elt || (val_cache.exhausted () && elt->args > 0)) break; - } + } } else invalid_operation (who, "writing"); @@ -3917,7 +3917,7 @@ if (tc_s.is_string ()) { - std::string s = tc_s.string_value (); + std::string s = tc_s.string_value (); retval = puts (s, who); } else @@ -3993,7 +3993,7 @@ if (in_mode == std::ios::in) retval = "r"; - else if (in_mode == std::ios::out + else if (in_mode == std::ios::out || in_mode == (std::ios::out | std::ios::trunc)) retval = "w"; else if (in_mode == (std::ios::out | std::ios::app)) @@ -4013,7 +4013,7 @@ retval = "ab"; else if (in_mode == (std::ios::in | std::ios::out | std::ios::binary)) retval = "r+b"; - else if (in_mode == (std::ios::in | std::ios::out | std::ios::trunc + else if (in_mode == (std::ios::in | std::ios::out | std::ios::trunc | std::ios::binary)) retval = "w+b"; else if (in_mode == (std::ios::in | std::ios::out | std::ios::ate