diff options
Diffstat (limited to 'libio/wfileops.c')
| -rw-r--r-- | libio/wfileops.c | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/libio/wfileops.c b/libio/wfileops.c index 2488821d54..fa265bc1ea 100644 --- a/libio/wfileops.c +++ b/libio/wfileops.c @@ -36,7 +36,7 @@ /* Convert TO_DO wide character from DATA to FP. Then mark FP as having empty buffers. */ int -_IO_wdo_write (_IO_FILE *fp, const wchar_t *data, _IO_size_t to_do) +_IO_wdo_write (FILE *fp, const wchar_t *data, size_t to_do) { struct _IO_codecvt *cc = fp->_codecvt; @@ -110,11 +110,11 @@ libc_hidden_def (_IO_wdo_write) wint_t -_IO_wfile_underflow (_IO_FILE *fp) +_IO_wfile_underflow (FILE *fp) { struct _IO_codecvt *cd; enum __codecvt_result status; - _IO_ssize_t count; + ssize_t count; if (__glibc_unlikely (fp->_flags & _IO_NO_READS)) { @@ -332,7 +332,7 @@ libc_hidden_def (_IO_wfile_underflow) static wint_t -_IO_wfile_underflow_mmap (_IO_FILE *fp) +_IO_wfile_underflow_mmap (FILE *fp) { struct _IO_codecvt *cd; const char *read_stop; @@ -393,7 +393,7 @@ _IO_wfile_underflow_mmap (_IO_FILE *fp) } static wint_t -_IO_wfile_underflow_maybe_mmap (_IO_FILE *fp) +_IO_wfile_underflow_maybe_mmap (FILE *fp) { /* This is the first read attempt. Doing the underflow will choose mmap or vanilla operations and then punt to the chosen underflow routine. @@ -406,7 +406,7 @@ _IO_wfile_underflow_maybe_mmap (_IO_FILE *fp) wint_t -_IO_wfile_overflow (_IO_FILE *f, wint_t wch) +_IO_wfile_overflow (FILE *f, wint_t wch) { if (f->_flags & _IO_NO_WRITES) /* SET ERROR */ { @@ -479,9 +479,9 @@ _IO_wfile_overflow (_IO_FILE *f, wint_t wch) libc_hidden_def (_IO_wfile_overflow) wint_t -_IO_wfile_sync (_IO_FILE *fp) +_IO_wfile_sync (FILE *fp) { - _IO_ssize_t delta; + ssize_t delta; wint_t retval = 0; /* char* ptr = cur_ptr(); */ @@ -494,7 +494,7 @@ _IO_wfile_sync (_IO_FILE *fp) /* We have to find out how many bytes we have to go back in the external buffer. */ struct _IO_codecvt *cv = fp->_codecvt; - _IO_off64_t new_pos; + off64_t new_pos; int clen = (*cv->__codecvt_do_encoding) (cv); @@ -519,7 +519,7 @@ _IO_wfile_sync (_IO_FILE *fp) } new_pos = _IO_SYSSEEK (fp, delta, 1); - if (new_pos != (_IO_off64_t) EOF) + if (new_pos != (off64_t) EOF) { fp->_wide_data->_IO_read_end = fp->_wide_data->_IO_read_ptr; fp->_IO_read_end = fp->_IO_read_ptr; @@ -544,7 +544,7 @@ libc_hidden_def (_IO_wfile_sync) Returns 0 on success and -1 on error with the _IO_ERR_SEEN flag set. */ static int -adjust_wide_data (_IO_FILE *fp, bool do_convert) +adjust_wide_data (FILE *fp, bool do_convert) { struct _IO_codecvt *cv = fp->_codecvt; @@ -591,10 +591,10 @@ done: /* ftell{,o} implementation for wide mode. Don't modify any state of the file pointer while we try to get the current state of the stream except in one case, which is when we have unflushed writes in append mode. */ -static _IO_off64_t -do_ftell_wide (_IO_FILE *fp) +static off64_t +do_ftell_wide (FILE *fp) { - _IO_off64_t result, offset = 0; + off64_t result, offset = 0; /* No point looking for offsets in the buffer if it hasn't even been allocated. */ @@ -740,11 +740,11 @@ do_ftell_wide (_IO_FILE *fp) return result; } -_IO_off64_t -_IO_wfile_seekoff (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode) +off64_t +_IO_wfile_seekoff (FILE *fp, off64_t offset, int dir, int mode) { - _IO_off64_t result; - _IO_off64_t delta, new_offset; + off64_t result; + off64_t delta, new_offset; long int count; /* Short-circuit into a separate function. We don't want to mix any @@ -860,8 +860,8 @@ _IO_wfile_seekoff (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode) if (fp->_offset != _IO_pos_BAD && fp->_IO_read_base != NULL && !_IO_in_backup (fp)) { - _IO_off64_t start_offset = (fp->_offset - - (fp->_IO_read_end - fp->_IO_buf_base)); + off64_t start_offset = (fp->_offset + - (fp->_IO_read_end - fp->_IO_buf_base)); if (offset >= start_offset && offset < fp->_offset) { _IO_setg (fp, fp->_IO_buf_base, @@ -954,13 +954,13 @@ resync: libc_hidden_def (_IO_wfile_seekoff) -_IO_size_t -_IO_wfile_xsputn (_IO_FILE *f, const void *data, _IO_size_t n) +size_t +_IO_wfile_xsputn (FILE *f, const void *data, size_t n) { const wchar_t *s = (const wchar_t *) data; - _IO_size_t to_do = n; + size_t to_do = n; int must_flush = 0; - _IO_size_t count; + size_t count; if (n <= 0) return 0; |