diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-12-13 23:17:54 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-12-13 23:17:54 +0000 |
| commit | 1e88bd0f1b62bd58f283241877a0b3e66e199e76 (patch) | |
| tree | 5c7c36e5188e78363b6fb79df0b6b7a843511dbd /libio/wstrops.c | |
| parent | f72386ad7c5009995612b4117a34de8c96d1509c (diff) | |
| download | glibc-1e88bd0f1b62bd58f283241877a0b3e66e199e76.tar.gz | |
[BZ #2337]
2006-12-13 Ulrich Drepper <drepper@redhat.com>
[BZ #2337]
* libio/Makefile (tests): Add tst-setvbuf1.
* libio/tst-setvbuf1.c: New file.
2006-12-08 Jakub Jelinek <jakub@redhat.com>
[BZ #2337]
* libio/genops.c (__uflow): Fix a typo.
* libio/wfiledoalloc.c (_IO_wfile_doallocate): Don't stat
nor set _IO_LINE_BUF bit here. Size the wide buffer based on
the narrow buffer size.
2006-11-24 Jakub Jelinek <jakub@redhat.com>
[BZ #2337]
* libio/libio.h (_IO_FLAGS2_USER_WBUF): Define.
* libio/wgenops.c (_IO_wsetb, _IO_wdefault_finish): Test and set
_IO_FLAGS2_USER_WBUF bit in _flags2 instead of _IO_USER_BUF bit
in _flags.
* libio/wstrops.c (_IO_wstr_overflow, enlarge_userbuf,
_IO_wstr_finish): Likewise.
* libio/wmemstream.c (open_wmemstream): Likewise.
* libio/fileops.c (_IO_new_file_close_it): Call _IO_set[bgp]
even for wide streams.
Diffstat (limited to 'libio/wstrops.c')
| -rw-r--r-- | libio/wstrops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libio/wstrops.c b/libio/wstrops.c index 8b862fb989..c5aae7bc6a 100644 --- a/libio/wstrops.c +++ b/libio/wstrops.c @@ -88,7 +88,7 @@ _IO_wstr_overflow (fp, c) pos = fp->_wide_data->_IO_write_ptr - fp->_wide_data->_IO_write_base; if (pos >= (_IO_size_t) (_IO_wblen (fp) + flush_only)) { - if (fp->_flags & _IO_USER_BUF) /* not allowed to enlarge */ + if (fp->_flags2 & _IO_FLAGS2_USER_WBUF) /* not allowed to enlarge */ return WEOF; else { @@ -182,7 +182,7 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading) _IO_ssize_t oldend = wd->_IO_write_end - wd->_IO_write_base; /* Try to enlarge the buffer. */ - if (fp->_flags & _IO_USER_BUF) + if (fp->_flags2 & _IO_FLAGS2_USER_WBUF) /* User-provided buffer. */ return 1; @@ -335,7 +335,7 @@ _IO_wstr_finish (fp, dummy) _IO_FILE *fp; int dummy; { - if (fp->_wide_data->_IO_buf_base && !(fp->_flags & _IO_USER_BUF)) + if (fp->_wide_data->_IO_buf_base && !(fp->_flags2 & _IO_FLAGS2_USER_WBUF)) (((_IO_strfile *) fp)->_s._free_buffer) (fp->_wide_data->_IO_buf_base); fp->_wide_data->_IO_buf_base = NULL; |