From: Petr Baudis <pasky@ucw.cz>
Date: Sat, 3 Sep 2011 17:53:42 +0000 (+0200)
Subject: Revert "Initialize variable in _IO_new_file_close_it"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf65c66723866e18be77c7676fde66deafd4d126;p=thirdparty%2Fglibc.git

Revert "Initialize variable in _IO_new_file_close_it"

This reverts commit 875703d0957adb972d542cfd174dba9bb95e8321.

Conflicts:

	ChangeLog
---

diff --git a/ChangeLog b/ChangeLog
index d05deb464e7..e3cc9bffdf1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-14  Ulrich Drepper  <drepper@gmail.com>
+
+	* iconv/loop.c (SINGLE) [STORE_REST]: Add input bytes to bytebuf before
+	storing incomplete byte sequence in state object.
+
 2011-05-17  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #12775]
diff --git a/libio/fileops.c b/libio/fileops.c
index 66c17dfbec2..adf4cfaea95 100644
--- a/libio/fileops.c
+++ b/libio/fileops.c
@@ -175,8 +175,6 @@ _IO_new_file_close_it (fp)
       else
 	write_status = _IO_SYSSEEK (fp, o, SEEK_SET) < 0 ? EOF : 0;
     }
-  else
-    write_status = 0;
 
   INTUSE(_IO_unsave_markers) (fp);