]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Revert "Initialize variable in _IO_new_file_close_it"
authorPetr Baudis <pasky@ucw.cz>
Sat, 3 Sep 2011 17:53:42 +0000 (19:53 +0200)
committerPetr Baudis <pasky@ucw.cz>
Sat, 3 Sep 2011 17:53:42 +0000 (19:53 +0200)
This reverts commit 875703d0957adb972d542cfd174dba9bb95e8321.

Conflicts:

ChangeLog

ChangeLog
libio/fileops.c

index d05deb464e75b8945993467648918cd9d94eab8f..e3cc9bffdf1f950e7028596d0014daac13248382 100644 (file)
--- 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]
index 66c17dfbec290ea49b6ddb997c21b5ca2a9f7b46..adf4cfaea953d8c69203f1241e4fb6c295cc9b93 100644 (file)
@@ -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);