This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] Mix of minor nits
- From: Paolo Carlini <pcarlini at unitus dot it>
- To: gcc-patches at gcc dot gnu dot org
- Date: Wed, 11 Jun 2003 00:04:25 +0200
- Subject: [v3] Mix of minor nits
Hi,
tested x86-linux.
Paolo.
///////
2003-06-10 Paolo Carlini <pcarlini@unitus.it>
* include/bits/fstream.tcc (close): Clean up a bit.
* include/bits/streambuf.tcc (sbumpc): Clean up a bit.
* include/std/std_fstream.h (_M_destroy_pback): _M_pback_cur_save
- the saved _M_in_cur, that is - cannot be null.
(sync): Constify a variable.
* include/std/std_streambuf.h: Tweak a comment.
(in_avail): Constify a variable.
diff -urN libstdc++-v3-orig/include/bits/fstream.tcc libstdc++-v3/include/bits/fstream.tcc
--- libstdc++-v3-orig/include/bits/fstream.tcc 2003-06-10 21:27:11.000000000 +0200
+++ libstdc++-v3/include/bits/fstream.tcc 2003-06-10 22:40:19.000000000 +0200
@@ -120,13 +120,12 @@
bool __testfail = false;
try
{
- const int_type __eof = traits_type::eof();
const bool __testput = this->_M_out_beg < this->_M_out_lim;
if (__testput
- && traits_type::eq_int_type(this->overflow(), __eof))
+ && traits_type::eq_int_type(this->overflow(),
+ traits_type::eof()))
__testfail = true;
-
#if 0
// XXX not done
if (_M_last_overflowed)
diff -urN libstdc++-v3-orig/include/bits/streambuf.tcc libstdc++-v3/include/bits/streambuf.tcc
--- libstdc++-v3-orig/include/bits/streambuf.tcc 2003-06-10 02:05:47.000000000 +0200
+++ libstdc++-v3/include/bits/streambuf.tcc 2003-06-10 22:36:40.000000000 +0200
@@ -47,9 +47,8 @@
int_type __ret;
if (_M_in_cur < _M_in_end)
{
- char_type __c = *this->_M_in_cur;
+ __ret = traits_type::to_int_type(*this->_M_in_cur);
_M_move_in_cur(1);
- __ret = traits_type::to_int_type(__c);
}
else
__ret = this->uflow();
diff -urN libstdc++-v3-orig/include/std/std_fstream.h libstdc++-v3/include/std/std_fstream.h
--- libstdc++-v3-orig/include/std/std_fstream.h 2003-06-10 02:05:48.000000000 +0200
+++ libstdc++-v3/include/std/std_fstream.h 2003-06-10 22:33:06.000000000 +0200
@@ -191,8 +191,7 @@
if (_M_pback_init)
{
// Length _M_in_cur moved in the pback buffer.
- if (_M_pback_cur_save)
- _M_pback_cur_save += this->_M_in_cur != this->_M_in_beg;
+ _M_pback_cur_save += this->_M_in_cur != this->_M_in_beg;
this->setg(this->_M_buf, _M_pback_cur_save, _M_pback_end_save);
_M_pback_init = false;
}
@@ -373,7 +372,7 @@
if (__testput)
{
// Need to restore current position after the write.
- off_type __off = this->_M_out_cur - this->_M_out_lim;
+ const off_type __off = this->_M_out_cur - this->_M_out_lim;
// _M_file.sync() will be called within.
if (traits_type::eq_int_type(this->overflow(), traits_type::eof()))
diff -urN libstdc++-v3-orig/include/std/std_streambuf.h libstdc++-v3/include/std/std_streambuf.h
--- libstdc++-v3-orig/include/std/std_streambuf.h 2003-06-10 02:05:48.000000000 +0200
+++ libstdc++-v3/include/std/std_streambuf.h 2003-06-10 22:33:53.000000000 +0200
@@ -181,7 +181,7 @@
* @if maint
* setp (and _M_set_buffer(0) in basic_filebuf) set it equal to
* _M_out_beg, then at each put operation it may be moved
- * forward (toward _M_out_end) by _M_out_cur_move.
+ * forward (toward _M_out_end) by _M_move_out_cur.
* @endif
*/
char_type* _M_out_lim; // End limit of used put area.
@@ -328,7 +328,7 @@
streamsize
in_avail()
{
- streamsize __ret = _M_in_end - _M_in_cur;
+ const streamsize __ret = _M_in_end - _M_in_cur;
return __ret ? __ret : this->showmanyc();
}