* basic_file_stdio.cc (__basic_file<char>::close): Don't flush stream

twice. Always set _M_cfile to 0 when stream was open. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@65458 138bc75d-0d04-0410-961f-82ee72b054a4
calebstewart · Apr 11, 2003 · bd18ac9 · bd18ac9
1 parent 4dfab37
commit bd18ac9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-10  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	* basic_file_stdio.cc (__basic_file<char>::close): Don't flush stream
+	twice.  Always set _M_cfile to 0 when stream was open.
+
 2003-04-09  Benjamin Kosnik  <bkoz@redhat.com>
 
 	Reshuffle 27_io testsuite.  * testsuite/27_io/filebuf.cc,

diff --git a/libstdc++-v3/config/io/basic_file_stdio.cc b/libstdc++-v3/config/io/basic_file_stdio.cc
@@ -195,12 +195,12 @@ namespace std
     __basic_file* __retval = static_cast<__basic_file*>(NULL);
     if (this->is_open())
       {
-	fflush(_M_cfile);
-	if ((_M_cfile_created && fclose(_M_cfile) == 0) || !_M_cfile_created)
-	  {
-	    _M_cfile = 0;
-	    __retval = this;
-	  }
+	if (_M_cfile_created)
+	  fclose(_M_cfile);
+	else
+	  fflush(_M_cfile);
+	_M_cfile = 0;
+	__retval = this;
       }
     return __retval;
   }