aboutsummaryrefslogtreecommitdiff
path: root/libio/wfileops.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-08-03 23:38:34 +0000
committerUlrich Drepper <drepper@redhat.com>2000-08-03 23:38:34 +0000
commitfaf8ccabe99e05cd815a9f0491b1e0d6fd8387f1 (patch)
tree3f422b056db8cb9eecd93ba0086cf5ad74b46ddf /libio/wfileops.c
parent5b9f1450817f1fdaef605222e9a9b41f2cdc1798 (diff)
downloadglibc-faf8ccabe99e05cd815a9f0491b1e0d6fd8387f1.tar
glibc-faf8ccabe99e05cd815a9f0491b1e0d6fd8387f1.tar.gz
glibc-faf8ccabe99e05cd815a9f0491b1e0d6fd8387f1.tar.bz2
glibc-faf8ccabe99e05cd815a9f0491b1e0d6fd8387f1.zip
Update.
2000-08-03 Ulrich Drepper <drepper@redhat.com> * libio/iofwide.c (_IO_fwide): Initialize fp->_codecvt as well. * libio/fileops.c (_IO_new_file_fopen): Use _codecvt not from _wide_data but from _IO_FILE directly. * libio/iofclose.c: Likewise. * libio/wfileops.c: Likewise. * libio/genops.c (_IO_default_showmanyc): Change return type to size_t. * libio/libioP.h: Change prototypes.
Diffstat (limited to 'libio/wfileops.c')
-rw-r--r--libio/wfileops.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libio/wfileops.c b/libio/wfileops.c
index 45c9120f34..9fa91f0399 100644
--- a/libio/wfileops.c
+++ b/libio/wfileops.c
@@ -59,7 +59,7 @@ _IO_wdo_write (fp, data, to_do)
const wchar_t *data;
_IO_size_t to_do;
{
- struct _IO_codecvt *cc = &fp->_wide_data->_codecvt;
+ struct _IO_codecvt *cc = &fp->_codecvt;
if (to_do > 0)
{
@@ -133,7 +133,7 @@ _IO_wfile_underflow (fp)
if (fp->_wide_data->_IO_read_ptr < fp->_wide_data->_IO_read_end)
return *fp->_wide_data->_IO_read_ptr;
- cd = &fp->_wide_data->_codecvt;
+ cd = &fp->_codecvt;
/* Maybe there is something left in the external buffer. */
if (fp->_IO_read_ptr < fp->_IO_read_end)
@@ -362,7 +362,7 @@ _IO_wfile_sync (fp)
{
/* We have to find out how many bytes we have to go back in the
external buffer. */
- struct _IO_codecvt *cv = &fp->_wide_data->_codecvt;
+ struct _IO_codecvt *cv = &fp->_codecvt;
_IO_off64_t new_pos;
int clen = (*cv->__codecvt_do_encoding) (cv);
@@ -466,7 +466,7 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
/* Adjust for read-ahead (bytes is buffer). To do this we must
find out which position in the external buffer corresponds to
the current position in the internal buffer. */
- cv = &fp->_wide_data->_codecvt;
+ cv = &fp->_codecvt;
clen = (*cv->__codecvt_do_encoding) (cv);
if (clen > 0)