fstream.tcc (close): Clean up a bit.

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.

From-SVN: r67738

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 62f3dc26f26b99940c1eb95809daf84204eea792..0c01a43308e49a7ae837a6e3cf8f64d35a6f8ab9 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,16 @@
+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.
+
 2003-06-10  Phil Edwards  <pme@gcc.gnu.org>
 
        * docs/html/17_intro/BUGS:  Update from 2.90.8 snapshot.

diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc
index 46dbdb2170da76820208e11efc80ebc62b436cc9..908cc7567af6a1e75b92bb93de1f067accdb4bac 100644 (file)
--- a/libstdc++-v3/include/bits/fstream.tcc
+++ b/libstdc++-v3/include/bits/fstream.tcc
@@ -120,13 +120,12 @@ namespace std
          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 --git a/libstdc++-v3/include/bits/streambuf.tcc b/libstdc++-v3/include/bits/streambuf.tcc
index 5b76c40f9288c85d77f47eb8aa028d6ca27cef2d..f6a96e855816153f98bce6125062c72976df6c34 100644 (file)
--- a/libstdc++-v3/include/bits/streambuf.tcc
+++ b/libstdc++-v3/include/bits/streambuf.tcc
@@ -47,9 +47,8 @@ namespace std
       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 --git a/libstdc++-v3/include/std/std_fstream.h b/libstdc++-v3/include/std/std_fstream.h
index fe72e9d9b18f6d2cc1c547d900ee1652e8ff29fe..7cc0dbd8e1f9916ac21dbd06ddeb460d8c5404c7 100644 (file)
--- a/libstdc++-v3/include/std/std_fstream.h
+++ b/libstdc++-v3/include/std/std_fstream.h
@@ -191,8 +191,7 @@ namespace std
        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 @@ namespace std
        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 --git a/libstdc++-v3/include/std/std_streambuf.h b/libstdc++-v3/include/std/std_streambuf.h
index b39ff9267c3e8bf2f5be4602431db89777527146..20928078d9dbd1c7ab1e17cd6e1fadd99a56cdd7 100644 (file)
--- a/libstdc++-v3/include/std/std_streambuf.h
+++ b/libstdc++-v3/include/std/std_streambuf.h
@@ -181,7 +181,7 @@ namespace std
        *  @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 @@ namespace std
       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();
       }