mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Update.
2002-02-25 Ulrich Drepper <drepper@redhat.com> * assert/assert-perr.c: Use INTUSE to reference functions and variables inside libc itself. Ise INTDEF and INTDEF2 to define appropriate aliases. Add prototypes for the new aliases. * assert/assert.c: Likewise. * include/libc-symbols.h: Likewise. * include/stdio.h: Likewise. * include/netinet/in.h: Likewise. * include/rpc/auth.h: Likewise. * include/rpc/auth_unix.h: Likewise. * include/rpc/key_prot.h: Likewise. * include/rpc/pmap_prot.h: Likewise. * include/rpc/pmap_rmt.h: Likewise. * include/rpc/rpc_msg.h: Likewise. * include/rpc/xdr.h: Likewise. * inet/gethstbyad_r.c: Likewise. * inet/gethstbynm2_r.c: Likewise. * inet/gethstbynm_r.c: Likewise. * inet/gethstent_r.c: Likewise. * inet/in6_addr.c: Likewise. * libio/__fpurge.c: Likewise. * libio/filedoalloc.c: Likewise. * libio/fileops.c: Likewise. * libio/ftello.c: Likewise. * libio/ftello64.c: Likewise. * libio/genops.c: Likewise. * libio/iofclose.c: Likewise. * libio/iofdopen.c: Likewise. * libio/iofflush.c: Likewise. * libio/iofflush_u.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgetpos64.c: Likewise. * libio/iofgets.c: Likewise. * libio/iofgets_u.c: Likewise. * libio/iofopen.c: Likewise. * libio/iofopncook.c: Likewise. * libio/iofputs.c: Likewise. * libio/iofread.c: Likewise. * libio/iofread_u.c: Likewise. * libio/iofsetpos.c: Likewise. * libio/iofsetpos64.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iogetline.c: Likewise. * libio/iogets.c: Likewise. * libio/iogetwline.c: Likewise. * libio/iolibio.h: Likewise. * libio/iopadn.c: Likewise. * libio/iopopen.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/iosetbuffer.c: Likewise. * libio/iosetvbuf.c: Likewise. * libio/ioungetc.c: Likewise. * libio/ioungetwc.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/libioP.h: Likewise. * libio/memstream.c: Likewise. * libio/obprintf.c: Likewise. * libio/oldfileops.c: Likewise. * libio/oldiofclose.c: Likewise. * libio/oldiofdopen.c: Likewise. * libio/oldiofgetpos.c: Likewise. * libio/oldiofgetpos64.c: Likewise. * libio/oldiofopen.c: Likewise. * libio/oldiofsetpos.c: Likewise. * libio/oldiofsetpos64.c: Likewise. * libio/oldiopopen.c: Likewise. * libio/oldstdfiles.c: Likewise. * libio/putc.c: Likewise. * libio/setbuf.c: Likewise. * libio/setlinebuf.c: Likewise. * libio/stdfiles.c: Likewise. * libio/stdio.c: Likewise. * libio/strops.c: Likewise. * libio/vasprintf.c: Likewise. * libio/vscanf.c: Likewise. * libio/vsnprintf.c: Likewise. * libio/vswprintf.c: Likewise. * libio/wfiledoalloc.c: Likewise. * libio/wfileops.c: Likewise. * libio/wgenops.c: Likewise. * libio/wstrops.c: Likewise. * malloc/mtrace.c: Likewise. * misc/error.c: Likewise. * misc/syslog.c: Likewise. * nss/getXXbyYY_r.c: Likewise. * nss/getXXent_r.c: Likewise. * nss/hosts-lookup.c: Likewise. * stdio-common/getw.c * stdio-common/printf-prs.c: Likewise. * stdio-common/printf_fp.c: Likewise. * stdio-common/printf_size.c: Likewise. * stdio-common/putw.c: Likewise. * stdio-common/scanf.c: Likewise. * stdio-common/sprintf.c: Likewise. * stdio-common/tmpfile64.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/strfmon.c: Likewise. * sunrpc/auth_des.c: Likewise. * sunrpc/auth_none.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/authdes_prot.c: Likewise. * sunrpc/authuxprot.c: Likewise. * sunrpc/clnt_perr.c: Likewise. * sunrpc/clnt_raw.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/clnt_unix.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/key_prot.c: Likewise. * sunrpc/openchild.c: Likewise. * sunrpc/pm_getmaps.c: Likewise. * sunrpc/pm_getport.c: Likewise. * sunrpc/pmap_clnt.c: Likewise. * sunrpc/pmap_prot.c: Likewise. * sunrpc/pmap_prot2.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/rpc_cmsg.c: Likewise. * sunrpc/rpc_prot.c: Likewise. * sunrpc/svc_authux.c: Likewise. * sunrpc/svc_raw.c: Likewise. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/svc_unix.c: Likewise. * sunrpc/xdr.c: Likewise. * sunrpc/xdr_array.c: Likewise. * sunrpc/xdr_mem.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * sunrpc/xdr_stdio.c: Likewise. * sysdeps/generic/_strerror.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * sysdeps/generic/tmpfile.c: Likewise. * sysdeps/gnu/errlist.awk: Likewise. * sysdeps/gnu/errlist.c: Likewise. * libio/Makefile (routines): Remove iosprint. * libio/iosprintf.c: Removed
This commit is contained in:
Ulrich Drepper
@ -58,7 +58,7 @@ _IO_wfile_setbuf (fp, p, len)
|
||||
wchar_t *p;
|
||||
_IO_ssize_t len;
|
||||
{
|
||||
if (_IO_wdefault_setbuf (fp, p, len) == NULL)
|
||||
if (INTUSE(_IO_wdefault_setbuf) (fp, p, len) == NULL)
|
||||
return NULL;
|
||||
|
||||
fp->_wide_data->_IO_write_base = fp->_wide_data->_IO_write_ptr =
|
||||
@ -131,6 +131,7 @@ _IO_wdo_write (fp, data, to_do)
|
||||
|
||||
return to_do == 0 ? 0 : WEOF;
|
||||
}
|
||||
INTDEF(_IO_wdo_write)
|
||||
|
||||
|
||||
wint_t
|
||||
@ -202,7 +203,7 @@ _IO_wfile_underflow (fp)
|
||||
free (fp->_IO_save_base);
|
||||
fp->_flags &= ~_IO_IN_BACKUP;
|
||||
}
|
||||
_IO_doallocbuf (fp);
|
||||
INTUSE(_IO_doallocbuf) (fp);
|
||||
|
||||
fp->_IO_read_base = fp->_IO_read_ptr = fp->_IO_read_end =
|
||||
fp->_IO_buf_base;
|
||||
@ -219,7 +220,7 @@ _IO_wfile_underflow (fp)
|
||||
free (fp->_wide_data->_IO_save_base);
|
||||
fp->_flags &= ~_IO_IN_BACKUP;
|
||||
}
|
||||
_IO_wdoallocbuf (fp);
|
||||
INTUSE(_IO_wdoallocbuf) (fp);
|
||||
}
|
||||
|
||||
/* Flush all line buffered files before reading. */
|
||||
@ -227,7 +228,7 @@ _IO_wfile_underflow (fp)
|
||||
if (fp->_flags & (_IO_LINE_BUF|_IO_UNBUFFERED))
|
||||
{
|
||||
#if 0
|
||||
_IO_flush_all_linebuffered ();
|
||||
INTUSE(_IO_flush_all_linebuffered) ();
|
||||
#else
|
||||
/* We used to flush all line-buffered stream. This really isn't
|
||||
required by any standard. My recollection is that
|
||||
@ -247,7 +248,7 @@ _IO_wfile_underflow (fp)
|
||||
#endif
|
||||
}
|
||||
|
||||
_IO_switch_to_get_mode (fp);
|
||||
INTUSE(_IO_switch_to_get_mode) (fp);
|
||||
|
||||
fp->_wide_data->_IO_read_base = fp->_wide_data->_IO_read_ptr =
|
||||
fp->_wide_data->_IO_buf_base;
|
||||
@ -306,6 +307,7 @@ _IO_wfile_underflow (fp)
|
||||
|
||||
return *fp->_wide_data->_IO_read_ptr;
|
||||
}
|
||||
INTDEF(_IO_wfile_underflow)
|
||||
|
||||
|
||||
static wint_t
|
||||
@ -347,7 +349,7 @@ _IO_wfile_underflow_mmap (_IO_FILE *fp)
|
||||
free (fp->_wide_data->_IO_save_base);
|
||||
fp->_flags &= ~_IO_IN_BACKUP;
|
||||
}
|
||||
_IO_wdoallocbuf (fp);
|
||||
INTUSE(_IO_wdoallocbuf) (fp);
|
||||
}
|
||||
|
||||
fp->_wide_data->_IO_last_state = fp->_wide_data->_IO_state;
|
||||
@ -390,13 +392,13 @@ _IO_wfile_overflow (f, wch)
|
||||
/* Allocate a buffer if needed. */
|
||||
if (f->_wide_data->_IO_write_base == 0)
|
||||
{
|
||||
_IO_wdoallocbuf (f);
|
||||
INTUSE(_IO_wdoallocbuf) (f);
|
||||
_IO_wsetg (f, f->_wide_data->_IO_buf_base,
|
||||
f->_wide_data->_IO_buf_base, f->_wide_data->_IO_buf_base);
|
||||
|
||||
if (f->_IO_write_base == NULL)
|
||||
{
|
||||
_IO_doallocbuf (f);
|
||||
INTUSE(_IO_doallocbuf) (f);
|
||||
_IO_setg (f, f->_IO_buf_base, f->_IO_buf_base, f->_IO_buf_base);
|
||||
}
|
||||
}
|
||||
@ -445,6 +447,7 @@ _IO_wfile_overflow (f, wch)
|
||||
return WEOF;
|
||||
return wch;
|
||||
}
|
||||
INTDEF(_IO_wfile_overflow)
|
||||
|
||||
wint_t
|
||||
_IO_wfile_sync (fp)
|
||||
@ -506,6 +509,7 @@ _IO_wfile_sync (fp)
|
||||
/* setg(base(), ptr, ptr); */
|
||||
return retval;
|
||||
}
|
||||
INTDEF(_IO_wfile_sync)
|
||||
|
||||
_IO_off64_t
|
||||
_IO_wfile_seekoff (fp, offset, dir, mode)
|
||||
@ -542,7 +546,7 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
|
||||
|
||||
/* There is no more data in the backup buffer. We can
|
||||
switch back. */
|
||||
_IO_switch_to_main_wget_area (fp);
|
||||
INTUSE(_IO_switch_to_main_wget_area) (fp);
|
||||
}
|
||||
|
||||
dir = _IO_seek_cur, offset = 0; /* Don't move any pointers. */
|
||||
@ -558,7 +562,7 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
|
||||
|
||||
if (fp->_wide_data->_IO_write_ptr > fp->_wide_data->_IO_write_base
|
||||
|| _IO_in_put_mode (fp))
|
||||
if (_IO_switch_to_wget_mode (fp))
|
||||
if (INTUSE(_IO_switch_to_wget_mode) (fp))
|
||||
return WEOF;
|
||||
|
||||
if (fp->_wide_data->_IO_buf_base == NULL)
|
||||
@ -569,7 +573,7 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
|
||||
free (fp->_wide_data->_IO_read_base);
|
||||
fp->_flags &= ~_IO_IN_BACKUP;
|
||||
}
|
||||
_IO_doallocbuf (fp);
|
||||
INTUSE(_IO_doallocbuf) (fp);
|
||||
_IO_setp (fp, fp->_IO_buf_base, fp->_IO_buf_base);
|
||||
_IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base);
|
||||
_IO_wsetp (fp, fp->_wide_data->_IO_buf_base,
|
||||
@ -692,7 +696,7 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
|
||||
}
|
||||
|
||||
#ifdef TODO
|
||||
_IO_unsave_markers (fp);
|
||||
INTUSE(_IO_unsave_markers) (fp);
|
||||
#endif
|
||||
|
||||
if (fp->_flags & _IO_NO_READS)
|
||||
@ -732,7 +736,7 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
|
||||
return offset;
|
||||
dumb:
|
||||
|
||||
_IO_unsave_markers (fp);
|
||||
INTUSE(_IO_unsave_markers) (fp);
|
||||
result = _IO_SYSSEEK (fp, offset, dir);
|
||||
if (result != EOF)
|
||||
{
|
||||
@ -757,6 +761,7 @@ resync:
|
||||
|
||||
return offset;
|
||||
}
|
||||
INTDEF(_IO_wfile_seekoff)
|
||||
|
||||
|
||||
_IO_size_t
|
||||
@ -822,62 +827,64 @@ _IO_wfile_xsputn (f, data, n)
|
||||
to_do -= count;
|
||||
}
|
||||
if (to_do > 0)
|
||||
to_do -= _IO_wdefault_xsputn (f, s, to_do);
|
||||
to_do -= INTUSE(_IO_wdefault_xsputn) (f, s, to_do);
|
||||
if (must_flush
|
||||
&& f->_wide_data->_IO_write_ptr != f->_wide_data->_IO_write_base)
|
||||
_IO_wdo_write (f, f->_wide_data->_IO_write_base,
|
||||
f->_wide_data->_IO_write_ptr
|
||||
- f->_wide_data->_IO_write_base);
|
||||
INTUSE(_IO_wdo_write) (f, f->_wide_data->_IO_write_base,
|
||||
f->_wide_data->_IO_write_ptr
|
||||
- f->_wide_data->_IO_write_base);
|
||||
|
||||
return n - to_do;
|
||||
}
|
||||
INTDEF(_IO_wfile_xsputn)
|
||||
|
||||
|
||||
struct _IO_jump_t _IO_wfile_jumps =
|
||||
{
|
||||
JUMP_INIT_DUMMY,
|
||||
JUMP_INIT(finish, _IO_new_file_finish),
|
||||
JUMP_INIT(overflow, (_IO_overflow_t) _IO_wfile_overflow),
|
||||
JUMP_INIT(underflow, (_IO_underflow_t) _IO_wfile_underflow),
|
||||
JUMP_INIT(uflow, (_IO_underflow_t) _IO_wdefault_uflow),
|
||||
JUMP_INIT(pbackfail, (_IO_pbackfail_t) _IO_wdefault_pbackfail),
|
||||
JUMP_INIT(xsputn, _IO_wfile_xsputn),
|
||||
JUMP_INIT(xsgetn, _IO_file_xsgetn),
|
||||
JUMP_INIT(seekoff, _IO_wfile_seekoff),
|
||||
JUMP_INIT(overflow, (_IO_overflow_t) INTUSE(_IO_wfile_overflow)),
|
||||
JUMP_INIT(underflow, (_IO_underflow_t) INTUSE(_IO_wfile_underflow)),
|
||||
JUMP_INIT(uflow, (_IO_underflow_t) INTUSE(_IO_wdefault_uflow)),
|
||||
JUMP_INIT(pbackfail, (_IO_pbackfail_t) INTUSE(_IO_wdefault_pbackfail)),
|
||||
JUMP_INIT(xsputn, INTUSE(_IO_wfile_xsputn)),
|
||||
JUMP_INIT(xsgetn, INTUSE(_IO_file_xsgetn)),
|
||||
JUMP_INIT(seekoff, INTUSE(_IO_wfile_seekoff)),
|
||||
JUMP_INIT(seekpos, _IO_default_seekpos),
|
||||
JUMP_INIT(setbuf, _IO_new_file_setbuf),
|
||||
JUMP_INIT(sync, (_IO_sync_t) _IO_wfile_sync),
|
||||
JUMP_INIT(sync, (_IO_sync_t) INTUSE(_IO_wfile_sync)),
|
||||
JUMP_INIT(doallocate, _IO_wfile_doallocate),
|
||||
JUMP_INIT(read, _IO_file_read),
|
||||
JUMP_INIT(read, INTUSE(_IO_file_read)),
|
||||
JUMP_INIT(write, _IO_new_file_write),
|
||||
JUMP_INIT(seek, _IO_file_seek),
|
||||
JUMP_INIT(close, _IO_file_close),
|
||||
JUMP_INIT(stat, _IO_file_stat),
|
||||
JUMP_INIT(seek, INTUSE(_IO_file_seek)),
|
||||
JUMP_INIT(close, INTUSE(_IO_file_close)),
|
||||
JUMP_INIT(stat, INTUSE(_IO_file_stat)),
|
||||
JUMP_INIT(showmanyc, _IO_default_showmanyc),
|
||||
JUMP_INIT(imbue, _IO_default_imbue)
|
||||
};
|
||||
INTDEF(_IO_wfile_jumps)
|
||||
|
||||
|
||||
struct _IO_jump_t _IO_wfile_jumps_mmap =
|
||||
{
|
||||
JUMP_INIT_DUMMY,
|
||||
JUMP_INIT(finish, _IO_new_file_finish),
|
||||
JUMP_INIT(overflow, (_IO_overflow_t) _IO_wfile_overflow),
|
||||
JUMP_INIT(overflow, (_IO_overflow_t) INTUSE(_IO_wfile_overflow)),
|
||||
JUMP_INIT(underflow, (_IO_underflow_t) _IO_wfile_underflow_mmap),
|
||||
JUMP_INIT(uflow, (_IO_underflow_t) _IO_wdefault_uflow),
|
||||
JUMP_INIT(pbackfail, (_IO_pbackfail_t) _IO_wdefault_pbackfail),
|
||||
JUMP_INIT(xsputn, _IO_wfile_xsputn),
|
||||
JUMP_INIT(xsgetn, _IO_file_xsgetn),
|
||||
JUMP_INIT(seekoff, _IO_wfile_seekoff),
|
||||
JUMP_INIT(uflow, (_IO_underflow_t) INTUSE(_IO_wdefault_uflow)),
|
||||
JUMP_INIT(pbackfail, (_IO_pbackfail_t) INTUSE(_IO_wdefault_pbackfail)),
|
||||
JUMP_INIT(xsputn, INTUSE(_IO_wfile_xsputn)),
|
||||
JUMP_INIT(xsgetn, INTUSE(_IO_file_xsgetn)),
|
||||
JUMP_INIT(seekoff, INTUSE(_IO_wfile_seekoff)),
|
||||
JUMP_INIT(seekpos, _IO_default_seekpos),
|
||||
JUMP_INIT(setbuf, _IO_new_file_setbuf),
|
||||
JUMP_INIT(sync, (_IO_sync_t) _IO_wfile_sync),
|
||||
JUMP_INIT(sync, (_IO_sync_t) INTUSE(_IO_wfile_sync)),
|
||||
JUMP_INIT(doallocate, _IO_wfile_doallocate),
|
||||
JUMP_INIT(read, _IO_file_read),
|
||||
JUMP_INIT(read, INTUSE(_IO_file_read)),
|
||||
JUMP_INIT(write, _IO_new_file_write),
|
||||
JUMP_INIT(seek, _IO_file_seek),
|
||||
JUMP_INIT(seek, INTUSE(_IO_file_seek)),
|
||||
JUMP_INIT(close, _IO_file_close_mmap),
|
||||
JUMP_INIT(stat, _IO_file_stat),
|
||||
JUMP_INIT(stat, INTUSE(_IO_file_stat)),
|
||||
JUMP_INIT(showmanyc, _IO_default_showmanyc),
|
||||
JUMP_INIT(imbue, _IO_default_imbue)
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user