summaryrefslogtreecommitdiff
path: root/libio/fileops.c
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2006-12-14 09:06:34 +0000
committerJakub Jelinek <jakub@redhat.com>2006-12-14 09:06:34 +0000
commitb51633c5723e311ffd59a2f5ec5759914ed9476b (patch)
tree117191337a4d725029756cbfc1bb2ff545e0606c /libio/fileops.c
parent985d254c909903787e4bbc517af30406e0e9df8b (diff)
Updated to fedora-glibc-20061214T0850cvs/fedora-glibc-2_5_90-13
Diffstat (limited to 'libio/fileops.c')
-rw-r--r--libio/fileops.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/libio/fileops.c b/libio/fileops.c
index cf7fd65421..dbd7a7a8f2 100644
--- a/libio/fileops.c
+++ b/libio/fileops.c
@@ -174,14 +174,8 @@ _IO_new_file_close_it (fp)
close_status = _IO_SYSCLOSE (fp);
/* Free buffer. */
- if (fp->_mode <= 0)
- {
- INTUSE(_IO_setb) (fp, NULL, NULL, 0);
- _IO_setg (fp, NULL, NULL, NULL);
- _IO_setp (fp, NULL, NULL);
- }
#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
- else
+ if (fp->_mode > 0)
{
if (_IO_have_wbackup (fp))
INTUSE(_IO_free_wbackup_area) (fp);
@@ -190,6 +184,9 @@ _IO_new_file_close_it (fp)
_IO_wsetp (fp, NULL, NULL);
}
#endif
+ INTUSE(_IO_setb) (fp, NULL, NULL, 0);
+ _IO_setg (fp, NULL, NULL, NULL);
+ _IO_setp (fp, NULL, NULL);
INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) fp);
fp->_flags = _IO_MAGIC|CLOSED_FILEBUF_FLAGS;