From 77fe0b9cd86ccba7349921082d886cbca613404c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 26 Feb 2002 01:45:59 +0000 Subject: Update. 2002-02-25 Ulrich Drepper * 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 --- stdio-common/getw.c | 4 ++-- stdio-common/printf-prs.c | 4 ++-- stdio-common/printf_fp.c | 4 ++-- stdio-common/printf_size.c | 4 ++-- stdio-common/putw.c | 4 ++-- stdio-common/scanf.c | 8 ++++++-- stdio-common/sprintf.c | 12 +++++++----- stdio-common/tmpfile64.c | 4 ++-- stdio-common/vfprintf.c | 35 ++++++++++++++++++++--------------- stdio-common/vfscanf.c | 13 +++++++------ 10 files changed, 52 insertions(+), 40 deletions(-) (limited to 'stdio-common') diff --git a/stdio-common/getw.c b/stdio-common/getw.c index 75e73667f2..81156e6781 100644 --- a/stdio-common/getw.c +++ b/stdio-common/getw.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1997, 1998, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ #ifdef USE_IN_LIBIO # include -# define fread(p, m, n, s) _IO_fread (p, m, n, s) +# define fread(p, m, n, s) INTUSE(_IO_fread) (p, m, n, s) #endif /* Read a word (int) from STREAM. */ diff --git a/stdio-common/printf-prs.c b/stdio-common/printf-prs.c index ae3fe41403..f0cd75b928 100644 --- a/stdio-common/printf-prs.c +++ b/stdio-common/printf-prs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,1992,1995,1996,1999,2000 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,95,96,99,2000,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -36,7 +36,7 @@ # define PUT(F, S, N) _IO_sputn (F, S, N) # define PAD(Padchar) \ if (width > 0) \ - done += _IO_padn (s, Padchar, width) + done += INTUSE(_IO_padn) (s, Padchar, width) # else # define PUTC(C, F) putc (C, F) ssize_t __printf_pad __P ((FILE *, char pad, size_t n)); diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c index 4c68c5edb3..66a60846c8 100644 --- a/stdio-common/printf_fp.c +++ b/stdio-common/printf_fp.c @@ -1,5 +1,5 @@ /* Floating point output for `printf'. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Ulrich Drepper , 1995. @@ -52,7 +52,7 @@ the GNU I/O library. */ #ifdef USE_IN_LIBIO # define PUT(f, s, n) _IO_sputn (f, s, n) -# define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : _IO_padn (f, c, n)) +# define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : INTUSE(_IO_padn) (f, c, n)) /* We use this file GNU C library and GNU I/O library. So make names equal. */ # undef putc diff --git a/stdio-common/printf_size.c b/stdio-common/printf_size.c index a036822f87..4f2807bf77 100644 --- a/stdio-common/printf_size.c +++ b/stdio-common/printf_size.c @@ -1,5 +1,5 @@ /* Print size value using units for orders of magnitude. - Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1997,1998,1999,2000,2001,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. Based on a proposal by Larry McVoy . @@ -34,7 +34,7 @@ the GNU I/O library. */ #ifdef USE_IN_LIBIO # define PUT(f, s, n) _IO_sputn (f, s, n) -# define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : _IO_padn (f, c, n)) +# define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : INTUSE(_IO_padn) (f, c, n)) /* We use this file GNU C library and GNU I/O library. So make names equal. */ # undef putc diff --git a/stdio-common/putw.c b/stdio-common/putw.c index d1b68ab27e..ddf9cedb8d 100644 --- a/stdio-common/putw.c +++ b/stdio-common/putw.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1997, 1998, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -20,7 +20,7 @@ #ifdef USE_IN_LIBIO # include -# define fwrite(p, n, m, s) _IO_fwrite (p, n, m, s) +# define fwrite(p, n, m, s) INTUSE(_IO_fwrite) (p, n, m, s) #endif /* Write the word (int) W to STREAM. */ diff --git a/stdio-common/scanf.c b/stdio-common/scanf.c index 6109599083..268aa905f8 100644 --- a/stdio-common/scanf.c +++ b/stdio-common/scanf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996, 1997, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -19,6 +19,10 @@ #include #include +#ifdef USE_IN_LIBIO +# include +#endif + /* Read formatted input from stdin according to the format string FORMAT. */ /* VARARGS1 */ @@ -30,7 +34,7 @@ scanf (const char *format, ...) va_start (arg, format); #ifdef USE_IN_LIBIO - done = _IO_vfscanf (stdin, format, arg, NULL); + done = INTUSE(_IO_vfscanf) (stdin, format, arg, NULL); #else done = vfscanf (stdin, format, arg); #endif diff --git a/stdio-common/sprintf.c b/stdio-common/sprintf.c index 867a27b827..f44a24b2b6 100644 --- a/stdio-common/sprintf.c +++ b/stdio-common/sprintf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1997, 1998, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -21,15 +21,13 @@ #ifdef USE_IN_LIBIO # include -# define vsprintf(s, f, a) _IO_vsprintf (s, f, a) +# define vsprintf(s, f, a) INTUSE(_IO_vsprintf) (s, f, a) #endif /* Write formatted output into S, according to the format string FORMAT. */ /* VARARGS2 */ int -sprintf (s, format) - char *s; - const char *format; +sprintf (char *s, const char *format, ...) { va_list arg; int done; @@ -40,3 +38,7 @@ sprintf (s, format) return done; } + +#ifdef USE_IN_LIBIO +strong_alias(sprintf, _IO_sprintf) +#endif diff --git a/stdio-common/tmpfile64.c b/stdio-common/tmpfile64.c index 1a87576f5e..1798d959c9 100644 --- a/stdio-common/tmpfile64.c +++ b/stdio-common/tmpfile64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,1993,1996,1997,1998,1999 Free Software Foundation, Inc. +/* Copyright (C) 1991,1993,1996-1999,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -21,7 +21,7 @@ #ifdef USE_IN_LIBIO # include -# define __fdopen _IO_fdopen +# define __fdopen INTUSE(_IO_fdopen) #endif /* This returns a new stream opened on a temporary file (generated diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c index febd094729..23d7c132d8 100644 --- a/stdio-common/vfprintf.c +++ b/stdio-common/vfprintf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1991-1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -75,7 +75,7 @@ # define PUT(F, S, N) _IO_sputn ((F), (S), (N)) # define PAD(Padchar) \ if (width > 0) \ - done += _IO_padn (s, (Padchar), width) + done += INTUSE(_IO_padn) (s, (Padchar), width) # define PUTC(C, F) _IO_putc_unlocked (C, F) # define ORIENT if (s->_vtable_offset == 0 && _IO_fwide (s, -1) != -1)\ return -1 @@ -2006,18 +2006,18 @@ _IO_helper_overflow (_IO_FILE *s, int c) static const struct _IO_jump_t _IO_helper_jumps = { JUMP_INIT_DUMMY, - JUMP_INIT (finish, _IO_wdefault_finish), + JUMP_INIT (finish, INTUSE(_IO_wdefault_finish)), JUMP_INIT (overflow, _IO_helper_overflow), JUMP_INIT (underflow, _IO_default_underflow), - JUMP_INIT (uflow, _IO_default_uflow), - JUMP_INIT (pbackfail, (_IO_pbackfail_t) _IO_wdefault_pbackfail), - JUMP_INIT (xsputn, _IO_wdefault_xsputn), - JUMP_INIT (xsgetn, _IO_wdefault_xsgetn), + JUMP_INIT (uflow, INTUSE(_IO_default_uflow)), + JUMP_INIT (pbackfail, (_IO_pbackfail_t) INTUSE(_IO_wdefault_pbackfail)), + JUMP_INIT (xsputn, INTUSE(_IO_wdefault_xsputn)), + JUMP_INIT (xsgetn, INTUSE(_IO_wdefault_xsgetn)), JUMP_INIT (seekoff, _IO_default_seekoff), JUMP_INIT (seekpos, _IO_default_seekpos), - JUMP_INIT (setbuf,(_IO_setbuf_t) _IO_wdefault_setbuf), + JUMP_INIT (setbuf,(_IO_setbuf_t) INTUSE(_IO_wdefault_setbuf)), JUMP_INIT (sync, _IO_default_sync), - JUMP_INIT (doallocate, _IO_wdefault_doallocate), + JUMP_INIT (doallocate, INTUSE(_IO_wdefault_doallocate)), JUMP_INIT (read, _IO_default_read), JUMP_INIT (write, _IO_default_write), JUMP_INIT (seek, _IO_default_seek), @@ -2028,18 +2028,18 @@ static const struct _IO_jump_t _IO_helper_jumps = static const struct _IO_jump_t _IO_helper_jumps = { JUMP_INIT_DUMMY, - JUMP_INIT (finish, _IO_default_finish), + JUMP_INIT (finish, INTUSE(_IO_default_finish)), JUMP_INIT (overflow, _IO_helper_overflow), JUMP_INIT (underflow, _IO_default_underflow), - JUMP_INIT (uflow, _IO_default_uflow), - JUMP_INIT (pbackfail, _IO_default_pbackfail), - JUMP_INIT (xsputn, _IO_default_xsputn), - JUMP_INIT (xsgetn, _IO_default_xsgetn), + JUMP_INIT (uflow, INTUSE(_IO_default_uflow)), + JUMP_INIT (pbackfail, INTUSE(_IO_default_pbackfail)), + JUMP_INIT (xsputn, INTUSE(_IO_default_xsputn)), + JUMP_INIT (xsgetn, INTUSE(_IO_default_xsgetn)), JUMP_INIT (seekoff, _IO_default_seekoff), JUMP_INIT (seekpos, _IO_default_seekpos), JUMP_INIT (setbuf, _IO_default_setbuf), JUMP_INIT (sync, _IO_default_sync), - JUMP_INIT (doallocate, _IO_default_doallocate), + JUMP_INIT (doallocate, INTUSE(_IO_default_doallocate)), JUMP_INIT (read, _IO_default_read), JUMP_INIT (write, _IO_default_write), JUMP_INIT (seek, _IO_default_seek), @@ -2083,7 +2083,11 @@ buffered_vfprintf (register _IO_FILE *s, const CHAR_T *format, _IO_JUMPS (&helper._f) = (struct _IO_jump_t *) &_IO_helper_jumps; /* Now print to helper instead. */ +#if defined USE_IN_LIBIO && !defined COMPILE_WPRINTF + result = INTUSE(_IO_vfprintf) (hp, format, args); +#else result = vfprintf (hp, format, args); +#endif /* Lock stream. */ __libc_cleanup_region_start (1, (void (*) (void *)) &_IO_funlockfile, s); @@ -2186,6 +2190,7 @@ strong_alias (_IO_vfwprintf, __vfwprintf); weak_alias (_IO_vfwprintf, vfwprintf); # else strong_alias (_IO_vfprintf, vfprintf); +INTDEF(_IO_vfprintf) # endif # else # if defined __ELF__ || defined __GNU_LIBRARY__ diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index b4b7d4dff1..0b4d030dfb 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1991-1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -75,9 +75,9 @@ # ifdef COMPILE_WSCANF # define ungetc(c, s) ((void) (c == WEOF \ || (--read_in, \ - _IO_sputbackwc (s, c)))) + INTUSE(_IO_sputbackwc) (s, c)))) # define ungetc_not_eof(c, s) ((void) (--read_in, \ - _IO_sputbackwc (s, c))) + INTUSE(_IO_sputbackwc) (s, c))) # define inchar() (c == WEOF ? WEOF \ : ((c = _IO_getwc_unlocked (s)), \ (void) (c != WEOF && ++read_in), c)) @@ -105,9 +105,9 @@ # else # define ungetc(c, s) ((void) ((int) c == EOF \ || (--read_in, \ - _IO_sputbackc (s, (unsigned char) c)))) + INTUSE(_IO_sputbackc) (s, (unsigned char) c)))) # define ungetc_not_eof(c, s) ((void) (--read_in, \ - _IO_sputbackc (s, (unsigned char) c))) + INTUSE(_IO_sputbackc) (s, (unsigned char) c))) # define inchar() (c == EOF ? EOF \ : ((c = _IO_getc_unlocked (s)), \ (void) (c != EOF && ++read_in), c)) @@ -2435,7 +2435,7 @@ __vfwscanf (FILE *s, const wchar_t *format, va_list argptr) int __vfscanf (FILE *s, const char *format, va_list argptr) { - return _IO_vfscanf (s, format, argptr, NULL); + return INTUSE(_IO_vfscanf) (s, format, argptr, NULL); } # endif #endif @@ -2444,4 +2444,5 @@ __vfscanf (FILE *s, const char *format, va_list argptr) weak_alias (__vfwscanf, vfwscanf) #else weak_alias (__vfscanf, vfscanf) +INTDEF(_IO_vfscanf) #endif -- cgit v1.2.1