aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Baudis <pasky@ucw.cz>2011-09-03 19:53:42 +0200
committerPetr Baudis <pasky@ucw.cz>2011-09-03 19:53:42 +0200
commitcf65c66723866e18be77c7676fde66deafd4d126 (patch)
tree2a5d1ef7e89e59edc929e79554b58fde5dd9a9aa
parent81313e32ef1885c1cb884042398b299df11f3e3c (diff)
downloadglibc-cf65c66723866e18be77c7676fde66deafd4d126.tar
glibc-cf65c66723866e18be77c7676fde66deafd4d126.tar.gz
glibc-cf65c66723866e18be77c7676fde66deafd4d126.tar.bz2
glibc-cf65c66723866e18be77c7676fde66deafd4d126.zip
Revert "Initialize variable in _IO_new_file_close_it"
This reverts commit 875703d0957adb972d542cfd174dba9bb95e8321. Conflicts: ChangeLog
-rw-r--r--ChangeLog5
-rw-r--r--libio/fileops.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d05deb464e..e3cc9bffdf 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 66c17dfbec..adf4cfaea9 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);