This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.15-1045-g56d25bb
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 24 May 2012 21:12:29 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-1045-g56d25bb
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 56d25bb888ac7ba977091c2b48401b0a443fc94a (commit)
via d18ea0c5e669dd48ccceccfc90ff458dc333a81f (commit)
from c14874927b499ddfdbb03745bb32bfc778b8595f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=56d25bb888ac7ba977091c2b48401b0a443fc94a
commit 56d25bb888ac7ba977091c2b48401b0a443fc94a
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Wed May 23 22:38:10 2012 +0200
Remove use of INTDEF/INTUSE in intl
diff --git a/ChangeLog b/ChangeLog
index 66df5ad..7b04fed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,23 @@
2012-05-24 Andreas Schwab <schwab@linux-m68k.org>
[BZ #14132]
+ * argp/argp-help.c (dgettext) [_LIBC]: Remove use of INTUSE.
+ * argp/argp-parse.c (dgettext) [_LIBC]: Likewise.
+ * intl/dgettext.c (DCGETTEXT): Likewise.
+ * intl/gettext.c (DCGETTEXT): Likewise.
+ * intl/l10nflist.c (__argz_count, __argz_stringify): Likewise.
+ * posix/regex_internal.h (gettext): Likewise.
+ * include/libintl.h (__dcgettext_internal, __dcngettext_internal):
+ Remove declaration.
+ * include/argz.h (__argz_count_internal)
+ (__argz_stringify_internal): Remove declaration.
+ (__argz_count, __argz_stringify): Declare hidden proto.
+ * intl/dcgettext.c: Remove use of INTDEF.
+ * string/argz-count.c: Replace INTDEF with libc_hidden_def.
+ * string/argz-stringify.c: Likewise.
+ * include/libio.h (_IO_free_backup_area, _IO_free_wbackup_area)
+ (_IO_padn, _IO_putc, _IO_sgetn, _IO_vfprintf, _IO_vfscanf):
+ Declare hidden proto.
* include/libio.h (_IO_free_backup_area, _IO_free_wbackup_area)
(_IO_padn, _IO_putc, _IO_sgetn, _IO_vfprintf, _IO_vfscanf):
Declare hidden proto.
diff --git a/argp/argp-help.c b/argp/argp-help.c
index 645006c..0af6805 100644
--- a/argp/argp-help.c
+++ b/argp/argp-help.c
@@ -1,5 +1,5 @@
/* Hierarchial argument parsing help output
- Copyright (C) 1995-2007, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
@@ -59,7 +59,7 @@ char *alloca ();
# ifdef _LIBC
# undef dgettext
# define dgettext(domain, msgid) \
- INTUSE(__dcgettext) (domain, msgid, LC_MESSAGES)
+ __dcgettext (domain, msgid, LC_MESSAGES)
# endif
# else
# define dgettext(domain, msgid) (msgid)
diff --git a/argp/argp-parse.c b/argp/argp-parse.c
index 5a2124e..9ac1a17 100644
--- a/argp/argp-parse.c
+++ b/argp/argp-parse.c
@@ -1,5 +1,5 @@
/* Hierarchial argument parsing, layered over getopt
- Copyright (C) 1995-2000, 2002, 2003, 2004, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>.
@@ -51,7 +51,7 @@ char *alloca ();
# ifdef _LIBC
# undef dgettext
# define dgettext(domain, msgid) \
- INTUSE(__dcgettext) (domain, msgid, LC_MESSAGES)
+ __dcgettext (domain, msgid, LC_MESSAGES)
# endif
# else
# define dgettext(domain, msgid) (msgid)
diff --git a/include/argz.h b/include/argz.h
index 4f45b0b..4eab0b6 100644
--- a/include/argz.h
+++ b/include/argz.h
@@ -3,10 +3,7 @@
#include <string/argz.h>
libc_hidden_proto (argz_delete)
-
-extern size_t __argz_count_internal (const char *__argz, size_t __len)
- __attribute_pure__ attribute_hidden;
-extern void __argz_stringify_internal (char *__argz, size_t __len, int __sep)
- attribute_hidden;
+libc_hidden_proto (__argz_count)
+libc_hidden_proto (__argz_stringify)
#endif
diff --git a/include/libintl.h b/include/libintl.h
index d15a6c0..0551a04 100644
--- a/include/libintl.h
+++ b/include/libintl.h
@@ -12,10 +12,6 @@ extern char *__dcgettext (const char *__domainname,
const char *__msgid, int __category)
__attribute_format_arg__ (2);
libc_hidden_proto (__dcgettext)
-extern char *__dcgettext_internal (const char *__domainname,
- const char *__msgid, int __category)
- __attribute_format_arg__ (2)
- attribute_hidden;
extern char *__ngettext (const char *__msgid1, const char *__msgid2,
unsigned long int __n)
@@ -28,12 +24,6 @@ extern char *__dcngettext (const char *__domainname,
const char *__msgid1, const char *__msgid2,
unsigned long int __n, int __category)
__attribute_format_arg__ (2) __attribute_format_arg__ (3);
-extern char *__dcngettext_internal (const char *__domainname,
- const char *__msgid1,
- const char *__msgid2,
- unsigned long int __n, int __category)
- __attribute_format_arg__ (2) __attribute_format_arg__ (3)
- attribute_hidden;
extern char *__textdomain (const char *__domainname);
extern char *__bindtextdomain (const char *__domainname,
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index 3074340..0f2942b 100644
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -1,5 +1,5 @@
/* Implementation of the dcgettext(3) function.
- Copyright (C) 1995-2002, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1995-2012 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
@@ -54,7 +54,6 @@ DCGETTEXT (domainname, msgid, category)
#ifdef _LIBC
/* Alias for function name in GNU C Library. */
-INTDEF(__dcgettext)
weak_alias (__dcgettext, dcgettext);
libc_hidden_def (__dcgettext)
#endif
diff --git a/intl/dgettext.c b/intl/dgettext.c
index d805f98..7718f4e 100644
--- a/intl/dgettext.c
+++ b/intl/dgettext.c
@@ -1,5 +1,5 @@
/* Implementation of the dgettext(3) function.
- Copyright (C) 1995-1997, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-2012 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
@@ -37,7 +37,7 @@
prefix. So we have to make a difference here. */
#ifdef _LIBC
# define DGETTEXT __dgettext
-# define DCGETTEXT INTUSE(__dcgettext)
+# define DCGETTEXT __dcgettext
#else
# define DGETTEXT libintl_dgettext
# define DCGETTEXT libintl_dcgettext
diff --git a/intl/gettext.c b/intl/gettext.c
index b24b623..fbc5984 100644
--- a/intl/gettext.c
+++ b/intl/gettext.c
@@ -1,5 +1,5 @@
/* Implementation of gettext(3) function.
- Copyright (C) 1995, 1997, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-2012 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
@@ -42,7 +42,7 @@
prefix. So we have to make a difference here. */
#ifdef _LIBC
# define GETTEXT __gettext
-# define DCGETTEXT INTUSE(__dcgettext)
+# define DCGETTEXT __dcgettext
#else
# define GETTEXT libintl_gettext
# define DCGETTEXT libintl_dcgettext
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index b67f8d4..32d8a01 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-2002, 2004, 2005, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
@@ -85,10 +85,6 @@ argz_count__ (argz, len)
}
# undef __argz_count
# define __argz_count(argz, len) argz_count__ (argz, len)
-#else
-# ifdef _LIBC
-# define __argz_count(argz, len) INTUSE(__argz_count) (argz, len)
-# endif
#endif /* !_LIBC && !HAVE___ARGZ_COUNT */
#if !defined _LIBC && !defined HAVE___ARGZ_STRINGIFY
@@ -113,11 +109,6 @@ argz_stringify__ (argz, len, sep)
}
# undef __argz_stringify
# define __argz_stringify(argz, len, sep) argz_stringify__ (argz, len, sep)
-#else
-# ifdef _LIBC
-# define __argz_stringify(argz, len, sep) \
- INTUSE(__argz_stringify) (argz, len, sep)
-# endif
#endif /* !_LIBC && !HAVE___ARGZ_STRINGIFY */
#if !defined _LIBC && !defined HAVE___ARGZ_NEXT
diff --git a/posix/regex_internal.h b/posix/regex_internal.h
index 1a16129..6dfdef6 100644
--- a/posix/regex_internal.h
+++ b/posix/regex_internal.h
@@ -1,5 +1,5 @@
/* Extended regular expression matching and search library.
- Copyright (C) 2002-2005, 2007, 2008, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2002-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
@@ -73,7 +73,7 @@
# ifdef _LIBC
# undef gettext
# define gettext(msgid) \
- INTUSE(__dcgettext) (_libc_intl_domainname, msgid, LC_MESSAGES)
+ __dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES)
# endif
#else
# define gettext(msgid) (msgid)
diff --git a/string/argz-count.c b/string/argz-count.c
index 723e9f2..b6baf8d 100644
--- a/string/argz-count.c
+++ b/string/argz-count.c
@@ -1,5 +1,5 @@
/* Routines for dealing with '\0' separated arg vectors.
- Copyright (C) 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.ai.mit.edu>
@@ -34,5 +34,5 @@ __argz_count (const char *argz, size_t len)
}
return count;
}
-INTDEF(__argz_count)
+libc_hidden_def (__argz_count)
weak_alias (__argz_count, argz_count)
diff --git a/string/argz-stringify.c b/string/argz-stringify.c
index 7ff8f6b..5b8582e 100644
--- a/string/argz-stringify.c
+++ b/string/argz-stringify.c
@@ -1,5 +1,5 @@
/* Routines for dealing with '\0' separated arg vectors.
- Copyright (C) 1995,96,97,2000,2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Miles Bader <miles@gnu.org>
@@ -36,5 +36,5 @@ __argz_stringify (char *argz, size_t len, int sep)
*argz++ = sep;
}
}
-INTDEF(__argz_stringify)
+libc_hidden_def (__argz_stringify)
weak_alias (__argz_stringify, argz_stringify)
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d18ea0c5e669dd48ccceccfc90ff458dc333a81f
commit d18ea0c5e669dd48ccceccfc90ff458dc333a81f
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Wed May 23 13:33:15 2012 +0200
Remove use of INTDEF/INTUSE in libio
diff --git a/ChangeLog b/ChangeLog
index 983ffe6..66df5ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,171 @@
+2012-05-24 Andreas Schwab <schwab@linux-m68k.org>
+
+ [BZ #14132]
+ * include/libio.h (_IO_free_backup_area, _IO_free_wbackup_area)
+ (_IO_padn, _IO_putc, _IO_sgetn, _IO_vfprintf, _IO_vfscanf):
+ Declare hidden proto.
+ * include/stdio.h (__asprintf_internal): Don't declare.
+ (__asprintf): Don't define as macro. Declare hidden proto.
+ * include/stdio_ext.h (__fsetlocking_internal): Don't declare.
+ (__fsetlocking): Declare hidden proto.
+ * libio/iolibio.h (_IO_fdopen, _IO_fflush, _IO_ftell, _IO_fread)
+ (_IO_fwrite, _IO_setbuffer, _IO_setvbuf, _IO_vsprintf): Declare
+ hidden proto.
+ (_IO_vprintf, _IO_freopen, _IO_freopen64, _IO_setbuf)
+ (_IO_setlinebuf): Remove use of INTUSE.
+ (_IO_setbuffer_internal, _IO_fread_internal, _IO_fdopen_internal)
+ (_IO_vsprintf_internal, _IO_fflush_internal, _IO_fwrite_internal)
+ (_IO_ftell_internal, _IO_fputs_internal, _IO_setvbuf_internal):
+ Remove declaration.
+ * libio/libioP.h (INTUSE, INTDEF, INTDEF2): Don't define.
+ (_IO_do_flush): Remove use of INTUSE.
+ (_IO_switch_to_get_mode, _IO_init, _IO_sputbackc, _IO_un_link)
+ (_IO_link_in, _IO_doallocbuf, _IO_unsave_markers, _IO_setb)
+ (_IO_adjust_column, _IO_least_wmarker)
+ (_IO_switch_to_main_wget_area, _IO_switch_to_wbackup_area)
+ (_IO_switch_to_wget_mode, _IO_wsetb, _IO_sputbackwc)
+ (_IO_wdoallocbuf, _IO_default_uflow, _IO_wdefault_uflow)
+ (_IO_default_doallocate, _IO_wdefault_doallocate)
+ (_IO_default_finish, _IO_wdefault_finish, _IO_default_pbackfail)
+ (_IO_wdefault_pbackfail, _IO_default_xsputn, _IO_wdefault_xsputn)
+ (_IO_default_xsgetn, _IO_wdefault_xsgetn, _IO_do_write)
+ (_IO_wdo_write, _IO_flush_all, _IO_flush_all_linebuffered)
+ (_IO_file_doallocate, _IO_file_setbuf, _IO_file_seekoff)
+ (_IO_file_xsputn, _IO_file_xsgetn, _IO_file_stat, _IO_file_close)
+ (_IO_file_underflow, _IO_file_overflow, _IO_file_init)
+ (_IO_file_attach, _IO_file_fopen, _IO_file_read, _IO_file_sync)
+ (_IO_file_close_it, _IO_file_seek, _IO_file_finish)
+ (_IO_wfile_xsputn, _IO_wfile_sync, _IO_wfile_underflow)
+ (_IO_wfile_overflow, _IO_wfile_seekoff, _IO_str_underflow)
+ (_IO_str_overflow, _IO_str_pbackfail, _IO_str_seekoff)
+ (_IO_getline, _IO_getline_info, _IO_list_all): Declare hidden
+ proto.
+ (_IO_flush_all_internal, _IO_adjust_column_internal)
+ (_IO_default_uflow_internal, _IO_default_finish_internal)
+ (_IO_default_pbackfail_internal, _IO_default_xsputn_internal)
+ (_IO_default_xsgetn_internal, _IO_default_doallocate_internal)
+ (_IO_wdefault_finish_internal, _IO_wdefault_pbackfail_internal)
+ (_IO_wdefault_xsputn_internal, _IO_wdefault_xsgetn_internal)
+ (_IO_wdefault_doallocate_internal, _IO_wdefault_uflow_internal)
+ (_IO_file_doallocate_internal, _IO_file_setbuf_internal)
+ (_IO_file_seekoff_internal, _IO_file_xsputn_internal)
+ (_IO_file_xsgetn_internal, _IO_file_stat_internal)
+ (_IO_file_close_internal, _IO_file_close_it_internal)
+ (_IO_file_underflow_internal, _IO_file_overflow_internal)
+ (_IO_file_init_internal, _IO_file_attach_internal)
+ (_IO_file_fopen_internal, _IO_file_read_internal)
+ (_IO_file_sync_internal, _IO_file_seek_internal)
+ (_IO_file_finish_internal, _IO_wfile_xsputn_internal)
+ (_IO_wfile_seekoff_internal, _IO_wfile_sync_internal)
+ (_IO_str_underflow_internal, _IO_str_overflow_internal)
+ (_IO_str_pbackfail_internal, _IO_str_seekoff_internal)
+ (_IO_file_jumps_internal, _IO_wfile_jumps_internal)
+ (_IO_list_all_internal, _IO_link_in_internal)
+ (_IO_sputbackc_internal, _IO_wdoallocbuf_internal)
+ (_IO_sgetn_internal, _IO_flush_all_linebuffered_internal)
+ (_IO_switch_to_wget_mode_internal, _IO_unsave_markers_internal)
+ (_IO_switch_to_main_wget_area_internal, _IO_wdo_write_internal)
+ (_IO_do_write_internal, _IO_padn_internal)
+ (_IO_getline_info_internal, _IO_getline_internal)
+ (_IO_free_wbackup_area_internal, _IO_free_backup_area_internal)
+ (_IO_switch_to_wbackup_area_internal, _IO_setb_internal)
+ (_IO_sputbackwc_internal, _IO_switch_to_get_mode_internal)
+ (_IO_vfscanf_internal, _IO_vfprintf_internal)
+ (_IO_doallocbuf_internal, _IO_wsetb_internal, _IO_putc_internal)
+ (_IO_init_internal, _IO_un_link_internal): Don't declare.
+ * libio/fileops.c: Replace INTDEF with libc_hidden_def and INTDEF2
+ with libc_hidden_ver, remove use of INTUSE.
+ * libio/genops.c: Likewise.
+ * libio/freopen.c: Likewise.
+ * libio/freopen64.c: Likewise.
+ * libio/iofclose.c: Likewise.
+ * libio/iofdopen.c: Likewise.
+ * libio/iofflush.c: Likewise.
+ * libio/iofflush_u.c: Likewise.
+ * libio/iofgets.c: Likewise.
+ * libio/iofgets_u.c: Likewise.
+ * libio/iofopen.c: Likewise.
+ * libio/iofopncook.c: Likewise.
+ * libio/iofread.c: Likewise.
+ * libio/iofread_u.c: Likewise.
+ * libio/ioftell.c: Likewise.
+ * libio/iofwrite.c: Likewise.
+ * libio/iogetline.c: Likewise.
+ * libio/iogets.c: Likewise.
+ * libio/iogetwline.c: 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/memstream.c: Likewise.
+ * libio/obprintf.c: Likewise.
+ * libio/oldfileops.c: Likewise.
+ * libio/oldiofclose.c: Likewise.
+ * libio/oldiofdopen.c: Likewise.
+ * libio/oldiofopen.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/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/wmemstream.c: Likewise.
+ * libio/wstrops.c: Likewise.
+ * libio/__fpurge.c: Likewise.
+ * libio/__fsetlocking.c: Likewise.
+ * assert/assert.c: Likewise.
+ * debug/fgets_chk.c: Likewise.
+ * debug/fgets_u_chk.c: Likewise.
+ * debug/fread_chk.c: Likewise.
+ * debug/fread_u_chk.c: Likewise.
+ * debug/gets_chk.c: Likewise.
+ * debug/obprintf_chk.c: Likewise.
+ * debug/vasprintf_chk.c: Likewise.
+ * debug/vdprintf_chk.c: Likewise.
+ * debug/vsnprintf_chk.c: Likewise.
+ * debug/vsprintf_chk.c: Likewise.
+ * malloc/mtrace.c: Likewise.
+ * misc/error.c: Likewise.
+ * misc/syslog.c: Likewise.
+ * stdio-common/asprintf.c: Likewise.
+ * stdio-common/fxprintf.c: Likewise.
+ * stdio-common/getw.c: Likewise.
+ * stdio-common/isoc99_fscanf.c: Likewise.
+ * stdio-common/isoc99_scanf.c: Likewise.
+ * stdio-common/isoc99_vfscanf.c: Likewise.
+ * stdio-common/isoc99_vscanf.c: Likewise.
+ * stdio-common/isoc99_vsscanf.c: Likewise.
+ * stdio-common/printf-prs.c: Likewise.
+ * stdio-common/printf_fp.c: Likewise.
+ * stdio-common/printf_fphex.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/tmpfile.c: Likewise.
+ * stdio-common/vfprintf.c: Likewise.
+ * stdio-common/vfscanf.c: Likewise.
+ * stdlib/strfmon_l.c: Likewise.
+ * sunrpc/openchild.c: Likewise.
+ * sunrpc/xdr_stdio.c: Likewise.
+ * sysdeps/ieee754/ldbl-opt/nldbl-compat.c: Likewise.
+ * sysdeps/mach/hurd/tmpfile.c: Likewise.
+
2012-05-24 Roland McGrath <roland@hack.frob.com>
* sysdeps/unix/sysv/linux/x86_64/x32/syscalls.list: New file.
diff --git a/assert/assert.c b/assert/assert.c
index 0830ac0..e4e2f21 100644
--- a/assert/assert.c
+++ b/assert/assert.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1991,1994-1996,1998,2001,2002,2005,2009,2011
- Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -31,7 +30,7 @@ extern const char *__progname;
#include <wchar.h>
#include <libio/iolibio.h>
-#define fflush(s) INTUSE(_IO_fflush) (s)
+#define fflush(s) _IO_fflush (s)
/* This function, when passed a string containing an asserted
expression, a filename, and a line number, prints a message
diff --git a/debug/fgets_chk.c b/debug/fgets_chk.c
index 720ba5d..046ac1d 100644
--- a/debug/fgets_chk.c
+++ b/debug/fgets_chk.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997, 1998, 1999, 2002, 2003, 2005
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -47,7 +46,7 @@ __fgets_chk (buf, size, n, fp)
case. We return an error only when there is a new error. */
int old_error = fp->_IO_file_flags & _IO_ERR_SEEN;
fp->_IO_file_flags &= ~_IO_ERR_SEEN;
- count = INTUSE(_IO_getline) (fp, buf, MIN ((size_t) n - 1, size), '\n', 1);
+ count = _IO_getline (fp, buf, MIN ((size_t) n - 1, size), '\n', 1);
/* If we read in some bytes and errno is EAGAIN, that error will
be reported for next read. */
if (count == 0 || ((fp->_IO_file_flags & _IO_ERR_SEEN)
diff --git a/debug/fgets_u_chk.c b/debug/fgets_u_chk.c
index 7784d24..5de92e0 100644
--- a/debug/fgets_u_chk.c
+++ b/debug/fgets_u_chk.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997, 1998, 1999, 2002, 2003, 2005
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -46,7 +45,7 @@ __fgets_unlocked_chk (buf, size, n, fp)
case. We return an error only when there is a new error. */
int old_error = fp->_IO_file_flags & _IO_ERR_SEEN;
fp->_IO_file_flags &= ~_IO_ERR_SEEN;
- count = INTUSE(_IO_getline) (fp, buf, MIN ((size_t) n - 1, size), '\n', 1);
+ count = _IO_getline (fp, buf, MIN ((size_t) n - 1, size), '\n', 1);
/* If we read in some bytes and errno is EAGAIN, that error will
be reported for next read. */
if (count == 0 || ((fp->_IO_file_flags & _IO_ERR_SEEN)
diff --git a/debug/fread_chk.c b/debug/fread_chk.c
index 7d5eded..bb8bada 100644
--- a/debug/fread_chk.c
+++ b/debug/fread_chk.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997, 1998, 1999, 2002, 2003, 2007
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -49,7 +48,7 @@ __fread_chk (void *__restrict ptr, size_t ptrlen,
size_t bytes_read;
_IO_acquire_lock (stream);
- bytes_read = INTUSE(_IO_sgetn) (stream, (char *) ptr, bytes_requested);
+ bytes_read = _IO_sgetn (stream, (char *) ptr, bytes_requested);
_IO_release_lock (stream);
return bytes_requested == bytes_read ? n : bytes_read / size;
}
diff --git a/debug/fread_u_chk.c b/debug/fread_u_chk.c
index 50c2291..fa4c9a9 100644
--- a/debug/fread_u_chk.c
+++ b/debug/fread_u_chk.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997, 1998, 1999, 2002, 2003, 2007
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -47,7 +46,6 @@ __fread_unlocked_chk (void *__restrict ptr, size_t ptrlen,
if (bytes_requested == 0)
return 0;
- size_t bytes_read
- = INTUSE(_IO_sgetn) (stream, (char *) ptr, bytes_requested);
+ size_t bytes_read = _IO_sgetn (stream, (char *) ptr, bytes_requested);
return bytes_requested == bytes_read ? n : bytes_read / size;
}
diff --git a/debug/gets_chk.c b/debug/gets_chk.c
index 01b7727..3a462ed 100644
--- a/debug/gets_chk.c
+++ b/debug/gets_chk.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1996, 1997, 1998, 2002, 2003, 2004
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -55,7 +54,7 @@ __gets_chk (char *buf, size_t size)
int old_error = _IO_stdin->_IO_file_flags & _IO_ERR_SEEN;
_IO_stdin->_IO_file_flags &= ~_IO_ERR_SEEN;
buf[0] = (char) ch;
- count = INTUSE(_IO_getline) (_IO_stdin, buf + 1, size - 1, '\n', 0) + 1;
+ count = _IO_getline (_IO_stdin, buf + 1, size - 1, '\n', 0) + 1;
if (_IO_stdin->_IO_file_flags & _IO_ERR_SEEN)
{
retval = NULL;
diff --git a/debug/obprintf_chk.c b/debug/obprintf_chk.c
index 0163a757..bca23f7 100644
--- a/debug/obprintf_chk.c
+++ b/debug/obprintf_chk.c
@@ -1,6 +1,5 @@
/* Print output of stream to given obstack.
- Copyright (C) 1996,1997,1999,2000,2001,2002,2003,2004,2005,2006,2008
- Free Software Foundation, Inc.
+ Copyright (C) 1996-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -92,7 +91,7 @@ __obstack_vprintf_chk (struct obstack *obstack, int flags, const char *format,
if (flags > 0)
new_f.ofile.file.file._flags2 |= _IO_FLAGS2_FORTIFY;
- result = INTUSE(_IO_vfprintf) (&new_f.ofile.file.file, format, args);
+ result = _IO_vfprintf (&new_f.ofile.file.file, format, args);
/* Shrink the buffer to the space we really currently need. */
obstack_blank_fast (obstack, (new_f.ofile.file.file._IO_write_ptr
diff --git a/debug/vasprintf_chk.c b/debug/vasprintf_chk.c
index 087945f..a8ca32b 100644
--- a/debug/vasprintf_chk.c
+++ b/debug/vasprintf_chk.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1995,1997,1999-2002,2004,2006,2008,2009
- Free Software Foundation, Inc.
+/* Copyright (C) 1995-2012 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
@@ -64,7 +63,7 @@ __vasprintf_chk (char **result_ptr, int flags, const char *format,
if (flags > 0)
sf._sbf._f._flags2 |= _IO_FLAGS2_FORTIFY;
- ret = INTUSE(_IO_vfprintf) (&sf._sbf._f, format, args);
+ ret = _IO_vfprintf (&sf._sbf._f, format, args);
if (ret < 0)
{
free (sf._sbf._f._IO_buf_base);
diff --git a/debug/vdprintf_chk.c b/debug/vdprintf_chk.c
index 4de3f75..16c1f7e 100644
--- a/debug/vdprintf_chk.c
+++ b/debug/vdprintf_chk.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1995, 1997-2000, 2001, 2002, 2003, 2006, 2008, 2010
- Free Software Foundation, Inc.
+/* Copyright (C) 1995-2012 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
@@ -40,13 +39,13 @@ __vdprintf_chk (int d, int flags, const char *format, va_list arg)
#endif
_IO_no_init (&tmpfil.file, _IO_USER_LOCK, 0, &wd, &_IO_wfile_jumps);
_IO_JUMPS (&tmpfil) = &_IO_file_jumps;
- INTUSE(_IO_file_init) (&tmpfil);
+ _IO_file_init (&tmpfil);
#if !_IO_UNIFIED_JUMPTABLES
tmpfil.vtable = NULL;
#endif
- if (INTUSE(_IO_file_attach) (&tmpfil.file, d) == NULL)
+ if (_IO_file_attach (&tmpfil.file, d) == NULL)
{
- INTUSE(_IO_un_link) (&tmpfil);
+ _IO_un_link (&tmpfil);
return EOF;
}
tmpfil.file._flags |= _IO_DELETE_DONT_CLOSE;
@@ -59,7 +58,7 @@ __vdprintf_chk (int d, int flags, const char *format, va_list arg)
if (flags > 0)
tmpfil.file._flags2 |= _IO_FLAGS2_FORTIFY;
- done = INTUSE(_IO_vfprintf) (&tmpfil.file, format, arg);
+ done = _IO_vfprintf (&tmpfil.file, format, arg);
_IO_FINISH (&tmpfil.file);
diff --git a/debug/vsnprintf_chk.c b/debug/vsnprintf_chk.c
index 258a050..5255039 100644
--- a/debug/vsnprintf_chk.c
+++ b/debug/vsnprintf_chk.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1991, 1995, 1997, 1998, 2004, 2006, 2009
- Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -61,7 +60,7 @@ ___vsnprintf_chk (char *s, size_t maxlen, int flags, size_t slen,
sf.f._sbf._f._flags2 |= _IO_FLAGS2_FORTIFY;
_IO_str_init_static_internal (&sf.f, s, maxlen - 1, s);
- ret = INTUSE(_IO_vfprintf) (&sf.f._sbf._f, format, args);
+ ret = _IO_vfprintf (&sf.f._sbf._f, format, args);
if (sf.f._sbf._f._IO_buf_base != sf.overflow_buf)
*sf.f._sbf._f._IO_write_ptr = '\0';
diff --git a/debug/vsprintf_chk.c b/debug/vsprintf_chk.c
index b5379ca..2258ee3 100644
--- a/debug/vsprintf_chk.c
+++ b/debug/vsprintf_chk.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1994, 1997, 1999-2003, 2004, 2006, 2009
- Free Software Foundation, Inc.
+/* Copyright (C) 1994-2012 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
@@ -40,16 +39,16 @@ static const struct _IO_jump_t _IO_str_chk_jumps =
JUMP_INIT_DUMMY,
JUMP_INIT(finish, _IO_str_finish),
JUMP_INIT(overflow, _IO_str_chk_overflow),
- JUMP_INIT(underflow, INTUSE(_IO_str_underflow)),
- JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT(pbackfail, INTUSE(_IO_str_pbackfail)),
- JUMP_INIT(xsputn, INTUSE(_IO_default_xsputn)),
- JUMP_INIT(xsgetn, INTUSE(_IO_default_xsgetn)),
- JUMP_INIT(seekoff, INTUSE(_IO_str_seekoff)),
+ JUMP_INIT(underflow, _IO_str_underflow),
+ JUMP_INIT(uflow, _IO_default_uflow),
+ JUMP_INIT(pbackfail, _IO_str_pbackfail),
+ JUMP_INIT(xsputn, _IO_default_xsputn),
+ JUMP_INIT(xsgetn, _IO_default_xsgetn),
+ JUMP_INIT(seekoff, _IO_str_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, _IO_default_setbuf),
JUMP_INIT(sync, _IO_default_sync),
- JUMP_INIT(doallocate, INTUSE(_IO_default_doallocate)),
+ JUMP_INIT(doallocate, _IO_default_doallocate),
JUMP_INIT(read, _IO_default_read),
JUMP_INIT(write, _IO_default_write),
JUMP_INIT(seek, _IO_default_seek),
@@ -83,7 +82,7 @@ ___vsprintf_chk (char *s, int flags, size_t slen, const char *format,
if (flags > 0)
f._sbf._f._flags2 |= _IO_FLAGS2_FORTIFY;
- ret = INTUSE(_IO_vfprintf) (&f._sbf._f, format, args);
+ ret = _IO_vfprintf (&f._sbf._f, format, args);
*f._sbf._f._IO_write_ptr = '\0';
return ret;
diff --git a/include/libio.h b/include/libio.h
index aca7000..735941d 100644
--- a/include/libio.h
+++ b/include/libio.h
@@ -10,6 +10,13 @@ libc_hidden_proto (__uflow)
libc_hidden_proto (__woverflow)
libc_hidden_proto (__wunderflow)
libc_hidden_proto (__wuflow)
+libc_hidden_proto (_IO_free_backup_area)
+libc_hidden_proto (_IO_free_wbackup_area)
+libc_hidden_proto (_IO_padn)
+libc_hidden_proto (_IO_putc)
+libc_hidden_proto (_IO_sgetn)
+libc_hidden_proto (_IO_vfprintf)
+libc_hidden_proto (_IO_vfscanf)
#if defined _IO_MTSAFE_IO && _IO_lock_inexpensive
# undef _IO_flockfile
diff --git a/include/stdio.h b/include/stdio.h
index a2c73a4..9f2ea31 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -116,13 +116,8 @@ extern int __fxprintf (FILE *__fp, const char *__fmt, ...)
extern const char *const _sys_errlist_internal[] attribute_hidden;
extern int _sys_nerr_internal attribute_hidden;
-extern int __asprintf_internal (char **__restrict __ptr,
- const char *__restrict __fmt, ...)
- attribute_hidden __attribute__ ((__format__ (__printf__, 2, 3)));
+libc_hidden_proto (__asprintf)
# if !defined NOT_IN_libc
-# define __asprintf(ptr, fmt, args...) \
- INTUSE(__asprintf) (ptr, fmt, ##args)
-
extern _IO_FILE *_IO_new_fopen (const char*, const char*);
# define fopen(fname, mode) _IO_new_fopen (fname, mode)
extern _IO_FILE *_IO_new_fdopen (int, const char*);
diff --git a/include/stdio_ext.h b/include/stdio_ext.h
index c7b7724..354146f 100644
--- a/include/stdio_ext.h
+++ b/include/stdio_ext.h
@@ -2,7 +2,7 @@
# include <stdio-common/stdio_ext.h>
-extern int __fsetlocking_internal (FILE *__fp, int __type) attribute_hidden;
+libc_hidden_proto (__fsetlocking)
#define __fsetlocking(fp, type) \
({ int __result = ((fp->_flags & _IO_USER_LOCK) \
diff --git a/libio/__fpurge.c b/libio/__fpurge.c
index 342456f..473a600 100644
--- a/libio/__fpurge.c
+++ b/libio/__fpurge.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2000-2012 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
@@ -25,7 +25,7 @@ __fpurge (FILE *fp)
{
/* Wide-char stream. */
if (_IO_in_backup (fp))
- INTUSE(_IO_free_wbackup_area) (fp);
+ _IO_free_wbackup_area (fp);
fp->_wide_data->_IO_read_end = fp->_wide_data->_IO_read_ptr;
fp->_wide_data->_IO_write_ptr = fp->_wide_data->_IO_write_base;
@@ -34,7 +34,7 @@ __fpurge (FILE *fp)
{
/* Byte stream. */
if (_IO_in_backup (fp))
- INTUSE(_IO_free_backup_area) (fp);
+ _IO_free_backup_area (fp);
fp->_IO_read_end = fp->_IO_read_ptr;
fp->_IO_write_ptr = fp->_IO_write_base;
diff --git a/libio/__fsetlocking.c b/libio/__fsetlocking.c
index b145329..8b0b52f 100644
--- a/libio/__fsetlocking.c
+++ b/libio/__fsetlocking.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2000-2012 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
@@ -34,4 +34,4 @@ __fsetlocking (FILE *fp, int type)
return result;
}
-INTDEF(__fsetlocking)
+libc_hidden_def (__fsetlocking)
diff --git a/libio/filedoalloc.c b/libio/filedoalloc.c
index 64eb731..b7733c7 100644
--- a/libio/filedoalloc.c
+++ b/libio/filedoalloc.c
@@ -126,7 +126,7 @@ _IO_file_doallocate (fp)
#endif
}
ALLOC_BUF (p, size, EOF);
- INTUSE(_IO_setb) (fp, p, p + size, 1);
+ _IO_setb (fp, p, p + size, 1);
return 1;
}
-INTDEF(_IO_file_doallocate)
+libc_hidden_def (_IO_file_doallocate)
diff --git a/libio/fileops.c b/libio/fileops.c
index 93750f8..7c7fef1 100644
--- a/libio/fileops.c
+++ b/libio/fileops.c
@@ -60,8 +60,6 @@ extern int errno;
# define lseek(FD, Offset, Whence) __lseek (FD, Offset, Whence)
# define read(FD, Buf, NBytes) __read (FD, Buf, NBytes)
# define write(FD, Buf, NBytes) __write (FD, Buf, NBytes)
-# define _IO_do_write _IO_new_do_write /* For macro uses. */
-# define _IO_file_close_it _IO_new_file_close_it
#else
# define _IO_new_do_write _IO_do_write
# define _IO_new_file_attach _IO_file_attach
@@ -148,10 +146,10 @@ _IO_new_file_init (fp)
fp->file._offset = _IO_pos_BAD;
fp->file._IO_file_flags |= CLOSED_FILEBUF_FLAGS;
- INTUSE(_IO_link_in) (fp);
+ _IO_link_in (fp);
fp->file._fileno = -1;
}
-INTDEF2(_IO_new_file_init, _IO_file_init)
+libc_hidden_ver (_IO_new_file_init, _IO_file_init)
int
_IO_new_file_close_it (fp)
@@ -175,7 +173,7 @@ _IO_new_file_close_it (fp)
else
write_status = 0;
- INTUSE(_IO_unsave_markers) (fp);
+ _IO_unsave_markers (fp);
int close_status = ((fp->_flags2 & _IO_FLAGS2_NOCLOSE) == 0
? _IO_SYSCLOSE (fp) : 0);
@@ -185,24 +183,24 @@ _IO_new_file_close_it (fp)
if (fp->_mode > 0)
{
if (_IO_have_wbackup (fp))
- INTUSE(_IO_free_wbackup_area) (fp);
- INTUSE(_IO_wsetb) (fp, NULL, NULL, 0);
+ _IO_free_wbackup_area (fp);
+ _IO_wsetb (fp, NULL, NULL, 0);
_IO_wsetg (fp, NULL, NULL, NULL);
_IO_wsetp (fp, NULL, NULL);
}
#endif
- INTUSE(_IO_setb) (fp, NULL, NULL, 0);
+ _IO_setb (fp, NULL, NULL, 0);
_IO_setg (fp, NULL, NULL, NULL);
_IO_setp (fp, NULL, NULL);
- INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) fp);
+ _IO_un_link ((struct _IO_FILE_plus *) fp);
fp->_flags = _IO_MAGIC|CLOSED_FILEBUF_FLAGS;
fp->_fileno = -1;
fp->_offset = _IO_pos_BAD;
return close_status ? close_status : write_status;
}
-INTDEF2(_IO_new_file_close_it, _IO_file_close_it)
+libc_hidden_ver (_IO_new_file_close_it, _IO_file_close_it)
void
_IO_new_file_finish (fp, dummy)
@@ -215,9 +213,9 @@ _IO_new_file_finish (fp, dummy)
if (!(fp->_flags & _IO_DELETE_DONT_CLOSE))
_IO_SYSCLOSE (fp);
}
- INTUSE(_IO_default_finish) (fp, 0);
+ _IO_default_finish (fp, 0);
}
-INTDEF2(_IO_new_file_finish, _IO_file_finish)
+libc_hidden_ver (_IO_new_file_finish, _IO_file_finish)
_IO_FILE *
_IO_file_open (fp, filename, posix_mode, prot, read_write, is32not64)
@@ -249,7 +247,7 @@ _IO_file_open (fp, filename, posix_mode, prot, read_write, is32not64)
close_not_cancel (fdesc);
return NULL;
}
- INTUSE(_IO_link_in) ((struct _IO_FILE_plus *) fp);
+ _IO_link_in ((struct _IO_FILE_plus *) fp);
return fp;
}
libc_hidden_def (_IO_file_open)
@@ -378,7 +376,7 @@ _IO_new_file_fopen (fp, filename, mode, is32not64)
/* Something went wrong, we cannot load the conversion modules.
This means we cannot proceed since the user explicitly asked
for these. */
- (void) INTUSE(_IO_file_close_it) (fp);
+ (void) _IO_file_close_it (fp);
__set_errno (EINVAL);
return NULL;
}
@@ -431,7 +429,7 @@ _IO_new_file_fopen (fp, filename, mode, is32not64)
return result;
}
-INTDEF2(_IO_new_file_fopen, _IO_file_fopen)
+libc_hidden_ver (_IO_new_file_fopen, _IO_file_fopen)
_IO_FILE *
_IO_new_file_attach (fp, fd)
@@ -453,7 +451,7 @@ _IO_new_file_attach (fp, fd)
__set_errno (save_errno);
return fp;
}
-INTDEF2(_IO_new_file_attach, _IO_file_attach)
+libc_hidden_ver (_IO_new_file_attach, _IO_file_attach)
_IO_FILE *
_IO_new_file_setbuf (fp, p, len)
@@ -470,7 +468,7 @@ _IO_new_file_setbuf (fp, p, len)
return fp;
}
-INTDEF2(_IO_new_file_setbuf, _IO_file_setbuf)
+libc_hidden_ver (_IO_new_file_setbuf, _IO_file_setbuf)
_IO_FILE *
@@ -512,7 +510,7 @@ _IO_new_do_write (fp, data, to_do)
return (to_do == 0
|| (_IO_size_t) new_do_write (fp, data, to_do) == to_do) ? 0 : EOF;
}
-INTDEF2(_IO_new_do_write, _IO_do_write)
+libc_hidden_ver (_IO_new_do_write, _IO_do_write)
static
_IO_size_t
@@ -539,8 +537,7 @@ new_do_write (fp, data, to_do)
}
count = _IO_SYSWRITE (fp, data, to_do);
if (fp->_cur_column && count)
- fp->_cur_column = INTUSE(_IO_adjust_column) (fp->_cur_column - 1, data,
- count) + 1;
+ fp->_cur_column = _IO_adjust_column (fp->_cur_column - 1, data, count) + 1;
_IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base);
fp->_IO_write_base = fp->_IO_write_ptr = fp->_IO_buf_base;
fp->_IO_write_end = (fp->_mode <= 0
@@ -577,7 +574,7 @@ _IO_new_file_underflow (fp)
free (fp->_IO_save_base);
fp->_flags &= ~_IO_IN_BACKUP;
}
- INTUSE(_IO_doallocbuf) (fp);
+ _IO_doallocbuf (fp);
}
/* Flush all line buffered files before reading. */
@@ -585,7 +582,7 @@ _IO_new_file_underflow (fp)
if (fp->_flags & (_IO_LINE_BUF|_IO_UNBUFFERED))
{
#if 0
- INTUSE(_IO_flush_all_linebuffered) ();
+ _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
@@ -602,7 +599,7 @@ _IO_new_file_underflow (fp)
#endif
}
- INTUSE(_IO_switch_to_get_mode) (fp);
+ _IO_switch_to_get_mode (fp);
/* This is very tricky. We have to adjust those
pointers before we call _IO_SYSREAD () since
@@ -629,7 +626,7 @@ _IO_new_file_underflow (fp)
_IO_pos_adjust (fp->_offset, count);
return *(unsigned char *) fp->_IO_read_ptr;
}
-INTDEF2(_IO_new_file_underflow, _IO_file_underflow)
+libc_hidden_ver (_IO_new_file_underflow, _IO_file_underflow)
/* Guts of underflow callback if we mmap the file. This stats the file and
updates the stream state to match. In the normal case we return zero.
@@ -802,7 +799,7 @@ decide_maybe_mmap (_IO_FILE *fp)
}
else
{
- INTUSE(_IO_setb) (fp, p, (char *) p + st.st_size, 0);
+ _IO_setb (fp, p, (char *) p + st.st_size, 0);
if (fp->_offset == _IO_pos_BAD)
fp->_offset = 0;
@@ -857,7 +854,7 @@ _IO_new_file_overflow (f, ch)
/* Allocate a buffer if needed. */
if (f->_IO_write_base == NULL)
{
- INTUSE(_IO_doallocbuf) (f);
+ _IO_doallocbuf (f);
_IO_setg (f, f->_IO_buf_base, f->_IO_buf_base, f->_IO_buf_base);
}
/* Otherwise must be currently reading.
@@ -870,7 +867,7 @@ _IO_new_file_overflow (f, ch)
if (__builtin_expect (_IO_in_backup (f), 0))
{
size_t nbackup = f->_IO_read_end - f->_IO_read_ptr;
- INTUSE(_IO_free_backup_area) (f);
+ _IO_free_backup_area (f);
f->_IO_read_base -= MIN (nbackup,
f->_IO_read_base - f->_IO_buf_base);
f->_IO_read_ptr = f->_IO_read_base;
@@ -888,20 +885,20 @@ _IO_new_file_overflow (f, ch)
f->_IO_write_end = f->_IO_write_ptr;
}
if (ch == EOF)
- return INTUSE(_IO_do_write) (f, f->_IO_write_base,
- f->_IO_write_ptr - f->_IO_write_base);
+ return _IO_do_write (f, f->_IO_write_base,
+ f->_IO_write_ptr - f->_IO_write_base);
if (f->_IO_write_ptr == f->_IO_buf_end ) /* Buffer is really full */
if (_IO_do_flush (f) == EOF)
return EOF;
*f->_IO_write_ptr++ = ch;
if ((f->_flags & _IO_UNBUFFERED)
|| ((f->_flags & _IO_LINE_BUF) && ch == '\n'))
- if (INTUSE(_IO_do_write) (f, f->_IO_write_base,
- f->_IO_write_ptr - f->_IO_write_base) == EOF)
+ if (_IO_do_write (f, f->_IO_write_base,
+ f->_IO_write_ptr - f->_IO_write_base) == EOF)
return EOF;
return (unsigned char) ch;
}
-INTDEF2(_IO_new_file_overflow, _IO_file_overflow)
+libc_hidden_ver (_IO_new_file_overflow, _IO_file_overflow)
int
_IO_new_file_sync (fp)
@@ -936,7 +933,7 @@ _IO_new_file_sync (fp)
/* setg(base(), ptr, ptr); */
return retval;
}
-INTDEF2(_IO_new_file_sync, _IO_file_sync)
+libc_hidden_ver (_IO_new_file_sync, _IO_file_sync)
static int
_IO_file_sync_mmap (_IO_FILE *fp)
@@ -993,7 +990,7 @@ _IO_new_file_seekoff (fp, offset, dir, mode)
FIXME: simulate mem-papped files. */
if (fp->_IO_write_ptr > fp->_IO_write_base || _IO_in_put_mode (fp))
- if (INTUSE(_IO_switch_to_get_mode) (fp))
+ if (_IO_switch_to_get_mode (fp))
return EOF;
if (fp->_IO_buf_base == NULL)
@@ -1004,7 +1001,7 @@ _IO_new_file_seekoff (fp, offset, dir, mode)
free (fp->_IO_read_base);
fp->_flags &= ~_IO_IN_BACKUP;
}
- INTUSE(_IO_doallocbuf) (fp);
+ _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);
}
@@ -1112,7 +1109,7 @@ _IO_new_file_seekoff (fp, offset, dir, mode)
return offset;
dumb:
- INTUSE(_IO_unsave_markers) (fp);
+ _IO_unsave_markers (fp);
result = _IO_SYSSEEK (fp, offset, dir);
if (result != EOF)
{
@@ -1133,7 +1130,7 @@ resync:
return offset;
}
-INTDEF2(_IO_new_file_seekoff, _IO_file_seekoff)
+libc_hidden_ver (_IO_new_file_seekoff, _IO_file_seekoff)
_IO_off64_t
_IO_file_seekoff_mmap (fp, offset, dir, mode)
@@ -1220,7 +1217,7 @@ _IO_file_read (fp, buf, size)
? read_not_cancel (fp->_fileno, buf, size)
: read (fp->_fileno, buf, size));
}
-INTDEF(_IO_file_read)
+libc_hidden_def (_IO_file_read)
_IO_off64_t
_IO_file_seek (fp, offset, dir)
@@ -1234,7 +1231,7 @@ _IO_file_seek (fp, offset, dir)
return lseek (fp->_fileno, offset, dir);
#endif
}
-INTDEF(_IO_file_seek)
+libc_hidden_def (_IO_file_seek)
int
_IO_file_stat (fp, st)
@@ -1247,7 +1244,7 @@ _IO_file_stat (fp, st)
return fstat (fp->_fileno, (struct stat *) st);
#endif
}
-INTDEF(_IO_file_stat)
+libc_hidden_def (_IO_file_stat)
int
_IO_file_close_mmap (fp)
@@ -1269,7 +1266,7 @@ _IO_file_close (fp)
unrecoverable state behind. */
return close_not_cancel (fp->_fileno);
}
-INTDEF(_IO_file_close)
+libc_hidden_def (_IO_file_close)
_IO_ssize_t
_IO_new_file_write (f, data, n)
@@ -1376,11 +1373,11 @@ _IO_new_file_xsputn (f, data, n)
buffer, but it's somewhat messier for line-buffered files,
so we let _IO_default_xsputn handle the general case. */
if (to_do)
- to_do -= INTUSE(_IO_default_xsputn) (f, s+do_write, to_do);
+ to_do -= _IO_default_xsputn (f, s+do_write, to_do);
}
return n - to_do;
}
-INTDEF2(_IO_new_file_xsputn, _IO_file_xsputn)
+libc_hidden_ver (_IO_new_file_xsputn, _IO_file_xsputn)
_IO_size_t
_IO_file_xsgetn (fp, data, n)
@@ -1402,7 +1399,7 @@ _IO_file_xsgetn (fp, data, n)
free (fp->_IO_save_base);
fp->_flags &= ~_IO_IN_BACKUP;
}
- INTUSE(_IO_doallocbuf) (fp);
+ _IO_doallocbuf (fp);
}
while (want > 0)
@@ -1481,7 +1478,7 @@ _IO_file_xsgetn (fp, data, n)
return n - want;
}
-INTDEF(_IO_file_xsgetn)
+libc_hidden_def (_IO_file_xsgetn)
static _IO_size_t _IO_file_xsgetn_mmap (_IO_FILE *, void *, _IO_size_t);
static _IO_size_t
@@ -1557,8 +1554,6 @@ _IO_file_xsgetn_maybe_mmap (fp, data, n)
}
#ifdef _LIBC
-# undef _IO_do_write
-# undef _IO_file_close_it
versioned_symbol (libc, _IO_new_do_write, _IO_do_write, GLIBC_2_1);
versioned_symbol (libc, _IO_new_file_attach, _IO_file_attach, GLIBC_2_1);
versioned_symbol (libc, _IO_new_file_close_it, _IO_file_close_it, GLIBC_2_1);
@@ -1577,23 +1572,23 @@ versioned_symbol (libc, _IO_new_file_xsputn, _IO_file_xsputn, GLIBC_2_1);
const struct _IO_jump_t _IO_file_jumps =
{
JUMP_INIT_DUMMY,
- JUMP_INIT(finish, INTUSE(_IO_file_finish)),
- JUMP_INIT(overflow, INTUSE(_IO_file_overflow)),
- JUMP_INIT(underflow, INTUSE(_IO_file_underflow)),
- JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT(pbackfail, INTUSE(_IO_default_pbackfail)),
- JUMP_INIT(xsputn, INTUSE(_IO_file_xsputn)),
- JUMP_INIT(xsgetn, INTUSE(_IO_file_xsgetn)),
+ JUMP_INIT(finish, _IO_file_finish),
+ JUMP_INIT(overflow, _IO_file_overflow),
+ JUMP_INIT(underflow, _IO_file_underflow),
+ JUMP_INIT(uflow, _IO_default_uflow),
+ JUMP_INIT(pbackfail, _IO_default_pbackfail),
+ JUMP_INIT(xsputn, _IO_file_xsputn),
+ JUMP_INIT(xsgetn, _IO_file_xsgetn),
JUMP_INIT(seekoff, _IO_new_file_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, _IO_new_file_setbuf),
JUMP_INIT(sync, _IO_new_file_sync),
- JUMP_INIT(doallocate, INTUSE(_IO_file_doallocate)),
- JUMP_INIT(read, INTUSE(_IO_file_read)),
+ JUMP_INIT(doallocate, _IO_file_doallocate),
+ JUMP_INIT(read, _IO_file_read),
JUMP_INIT(write, _IO_new_file_write),
- JUMP_INIT(seek, INTUSE(_IO_file_seek)),
- JUMP_INIT(close, INTUSE(_IO_file_close)),
- JUMP_INIT(stat, INTUSE(_IO_file_stat)),
+ JUMP_INIT(seek, _IO_file_seek),
+ JUMP_INIT(close, _IO_file_close),
+ JUMP_INIT(stat, _IO_file_stat),
JUMP_INIT(showmanyc, _IO_default_showmanyc),
JUMP_INIT(imbue, _IO_default_imbue)
};
@@ -1602,23 +1597,23 @@ libc_hidden_data_def (_IO_file_jumps)
const struct _IO_jump_t _IO_file_jumps_mmap =
{
JUMP_INIT_DUMMY,
- JUMP_INIT(finish, INTUSE(_IO_file_finish)),
- JUMP_INIT(overflow, INTUSE(_IO_file_overflow)),
+ JUMP_INIT(finish, _IO_file_finish),
+ JUMP_INIT(overflow, _IO_file_overflow),
JUMP_INIT(underflow, _IO_file_underflow_mmap),
- JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT(pbackfail, INTUSE(_IO_default_pbackfail)),
+ JUMP_INIT(uflow, _IO_default_uflow),
+ JUMP_INIT(pbackfail, _IO_default_pbackfail),
JUMP_INIT(xsputn, _IO_new_file_xsputn),
JUMP_INIT(xsgetn, _IO_file_xsgetn_mmap),
JUMP_INIT(seekoff, _IO_file_seekoff_mmap),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, (_IO_setbuf_t) _IO_file_setbuf_mmap),
JUMP_INIT(sync, _IO_file_sync_mmap),
- JUMP_INIT(doallocate, INTUSE(_IO_file_doallocate)),
- JUMP_INIT(read, INTUSE(_IO_file_read)),
+ JUMP_INIT(doallocate, _IO_file_doallocate),
+ JUMP_INIT(read, _IO_file_read),
JUMP_INIT(write, _IO_new_file_write),
- JUMP_INIT(seek, INTUSE(_IO_file_seek)),
+ JUMP_INIT(seek, _IO_file_seek),
JUMP_INIT(close, _IO_file_close_mmap),
- JUMP_INIT(stat, INTUSE(_IO_file_stat)),
+ JUMP_INIT(stat, _IO_file_stat),
JUMP_INIT(showmanyc, _IO_default_showmanyc),
JUMP_INIT(imbue, _IO_default_imbue)
};
@@ -1626,23 +1621,23 @@ const struct _IO_jump_t _IO_file_jumps_mmap =
const struct _IO_jump_t _IO_file_jumps_maybe_mmap =
{
JUMP_INIT_DUMMY,
- JUMP_INIT(finish, INTUSE(_IO_file_finish)),
- JUMP_INIT(overflow, INTUSE(_IO_file_overflow)),
+ JUMP_INIT(finish, _IO_file_finish),
+ JUMP_INIT(overflow, _IO_file_overflow),
JUMP_INIT(underflow, _IO_file_underflow_maybe_mmap),
- JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT(pbackfail, INTUSE(_IO_default_pbackfail)),
+ JUMP_INIT(uflow, _IO_default_uflow),
+ JUMP_INIT(pbackfail, _IO_default_pbackfail),
JUMP_INIT(xsputn, _IO_new_file_xsputn),
JUMP_INIT(xsgetn, _IO_file_xsgetn_maybe_mmap),
JUMP_INIT(seekoff, _IO_file_seekoff_maybe_mmap),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, (_IO_setbuf_t) _IO_file_setbuf_mmap),
JUMP_INIT(sync, _IO_new_file_sync),
- JUMP_INIT(doallocate, INTUSE(_IO_file_doallocate)),
- JUMP_INIT(read, INTUSE(_IO_file_read)),
+ JUMP_INIT(doallocate, _IO_file_doallocate),
+ JUMP_INIT(read, _IO_file_read),
JUMP_INIT(write, _IO_new_file_write),
- JUMP_INIT(seek, INTUSE(_IO_file_seek)),
+ JUMP_INIT(seek, _IO_file_seek),
JUMP_INIT(close, _IO_file_close),
- JUMP_INIT(stat, INTUSE(_IO_file_stat)),
+ JUMP_INIT(stat, _IO_file_stat),
JUMP_INIT(showmanyc, _IO_default_showmanyc),
JUMP_INIT(imbue, _IO_default_imbue)
};
diff --git a/libio/freopen.c b/libio/freopen.c
index fa89c27..9303106 100644
--- a/libio/freopen.c
+++ b/libio/freopen.c
@@ -65,11 +65,11 @@ freopen (filename, mode, fp)
else
#endif
{
- INTUSE(_IO_file_close_it) (fp);
+ _IO_file_close_it (fp);
_IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps;
if (_IO_vtable_offset (fp) == 0 && fp->_wide_data != NULL)
fp->_wide_data->_wide_vtable = &_IO_wfile_jumps;
- result = INTUSE(_IO_file_fopen) (fp, gfilename, mode, 1);
+ result = _IO_file_fopen (fp, gfilename, mode, 1);
if (result != NULL)
result = __fopen_maybe_mmap (result);
}
diff --git a/libio/freopen64.c b/libio/freopen64.c
index c28a992..135049f 100644
--- a/libio/freopen64.c
+++ b/libio/freopen64.c
@@ -50,11 +50,11 @@ freopen64 (filename, mode, fp)
const char *gfilename = (filename == NULL && fd >= 0
? fd_to_filename (fd) : filename);
fp->_flags2 |= _IO_FLAGS2_NOCLOSE;
- INTUSE(_IO_file_close_it) (fp);
+ _IO_file_close_it (fp);
_IO_JUMPS ((struct _IO_FILE_plus *) fp) = &_IO_file_jumps;
if (_IO_vtable_offset (fp) == 0 && fp->_wide_data != NULL)
fp->_wide_data->_wide_vtable = &_IO_wfile_jumps;
- result = INTUSE(_IO_file_fopen) (fp, gfilename, mode, 0);
+ result = _IO_file_fopen (fp, gfilename, mode, 0);
fp->_flags2 &= ~_IO_FLAGS2_NOCLOSE;
if (result != NULL)
result = __fopen_maybe_mmap (result);
diff --git a/libio/genops.c b/libio/genops.c
index 272b94d..b7dd863 100644
--- a/libio/genops.c
+++ b/libio/genops.c
@@ -68,16 +68,15 @@ _IO_un_link (fp)
run_fp = (_IO_FILE *) fp;
_IO_flockfile ((_IO_FILE *) fp);
#endif
- if (INTUSE(_IO_list_all) == NULL)
+ if (_IO_list_all == NULL)
;
- else if (fp == INTUSE(_IO_list_all))
+ else if (fp == _IO_list_all)
{
- INTUSE(_IO_list_all)
- = (struct _IO_FILE_plus *) INTUSE(_IO_list_all)->file._chain;
+ _IO_list_all = (struct _IO_FILE_plus *) _IO_list_all->file._chain;
++_IO_list_all_stamp;
}
else
- for (f = &INTUSE(_IO_list_all)->file._chain; *f; f = &(*f)->_chain)
+ for (f = &_IO_list_all->file._chain; *f; f = &(*f)->_chain)
if (*f == (_IO_FILE *) fp)
{
*f = fp->file._chain;
@@ -93,7 +92,7 @@ _IO_un_link (fp)
#endif
}
}
-INTDEF(_IO_un_link)
+libc_hidden_def (_IO_un_link)
void
_IO_link_in (fp)
@@ -108,8 +107,8 @@ _IO_link_in (fp)
run_fp = (_IO_FILE *) fp;
_IO_flockfile ((_IO_FILE *) fp);
#endif
- fp->file._chain = (_IO_FILE *) INTUSE(_IO_list_all);
- INTUSE(_IO_list_all) = fp;
+ fp->file._chain = (_IO_FILE *) _IO_list_all;
+ _IO_list_all = fp;
++_IO_list_all_stamp;
#ifdef _IO_MTSAFE_IO
_IO_funlockfile ((_IO_FILE *) fp);
@@ -119,7 +118,7 @@ _IO_link_in (fp)
#endif
}
}
-INTDEF(_IO_link_in)
+libc_hidden_def (_IO_link_in)
/* Return minimum _pos markers
Assumes the current get area is the main get area. */
@@ -200,7 +199,7 @@ _IO_switch_to_get_mode (fp)
fp->_flags &= ~_IO_CURRENTLY_PUTTING;
return 0;
}
-INTDEF(_IO_switch_to_get_mode)
+libc_hidden_def (_IO_switch_to_get_mode)
void
_IO_free_backup_area (fp)
@@ -213,7 +212,7 @@ _IO_free_backup_area (fp)
fp->_IO_save_end = NULL;
fp->_IO_backup_base = NULL;
}
-INTDEF(_IO_free_backup_area)
+libc_hidden_def (_IO_free_backup_area)
#if 0
int
@@ -338,7 +337,7 @@ __underflow (fp)
if (fp->_mode == 0)
_IO_fwide (fp, -1);
if (_IO_in_put_mode (fp))
- if (INTUSE(_IO_switch_to_get_mode) (fp) == EOF)
+ if (_IO_switch_to_get_mode (fp) == EOF)
return EOF;
if (fp->_IO_read_ptr < fp->_IO_read_end)
return *(unsigned char *) fp->_IO_read_ptr;
@@ -354,7 +353,7 @@ __underflow (fp)
return EOF;
}
else if (_IO_have_backup (fp))
- INTUSE(_IO_free_backup_area) (fp);
+ _IO_free_backup_area (fp);
return _IO_UNDERFLOW (fp);
}
libc_hidden_def (__underflow)
@@ -371,7 +370,7 @@ __uflow (fp)
if (fp->_mode == 0)
_IO_fwide (fp, -1);
if (_IO_in_put_mode (fp))
- if (INTUSE(_IO_switch_to_get_mode) (fp) == EOF)
+ if (_IO_switch_to_get_mode (fp) == EOF)
return EOF;
if (fp->_IO_read_ptr < fp->_IO_read_end)
return *(unsigned char *) fp->_IO_read_ptr++;
@@ -387,7 +386,7 @@ __uflow (fp)
return EOF;
}
else if (_IO_have_backup (fp))
- INTUSE(_IO_free_backup_area) (fp);
+ _IO_free_backup_area (fp);
return _IO_UFLOW (fp);
}
libc_hidden_def (__uflow)
@@ -408,7 +407,7 @@ _IO_setb (f, b, eb, a)
else
f->_flags |= _IO_USER_BUF;
}
-INTDEF(_IO_setb)
+libc_hidden_def (_IO_setb)
void
_IO_doallocbuf (fp)
@@ -419,9 +418,9 @@ _IO_doallocbuf (fp)
if (!(fp->_flags & _IO_UNBUFFERED) || fp->_mode > 0)
if (_IO_DOALLOCATE (fp) != EOF)
return;
- INTUSE(_IO_setb) (fp, fp->_shortbuf, fp->_shortbuf+1, 0);
+ _IO_setb (fp, fp->_shortbuf, fp->_shortbuf+1, 0);
}
-INTDEF(_IO_doallocbuf)
+libc_hidden_def (_IO_doallocbuf)
int
_IO_default_underflow (fp)
@@ -439,7 +438,7 @@ _IO_default_uflow (fp)
return EOF;
return *(unsigned char *) fp->_IO_read_ptr++;
}
-INTDEF(_IO_default_uflow)
+libc_hidden_def (_IO_default_uflow)
_IO_size_t
_IO_default_xsputn (f, data, n)
@@ -485,7 +484,7 @@ _IO_default_xsputn (f, data, n)
}
return n - more;
}
-INTDEF(_IO_default_xsputn)
+libc_hidden_def (_IO_default_xsputn)
_IO_size_t
_IO_sgetn (fp, data, n)
@@ -496,7 +495,7 @@ _IO_sgetn (fp, data, n)
/* FIXME handle putback buffer here! */
return _IO_XSGETN (fp, data, n);
}
-INTDEF(_IO_sgetn)
+libc_hidden_def (_IO_sgetn)
_IO_size_t
_IO_default_xsgetn (fp, data, n)
@@ -539,7 +538,7 @@ _IO_default_xsgetn (fp, data, n)
}
return n - more;
}
-INTDEF(_IO_default_xsgetn)
+libc_hidden_def (_IO_default_xsgetn)
#if 0
/* Seems not to be needed. --drepper */
@@ -562,12 +561,12 @@ _IO_default_setbuf (fp, p, len)
if (p == NULL || len == 0)
{
fp->_flags |= _IO_UNBUFFERED;
- INTUSE(_IO_setb) (fp, fp->_shortbuf, fp->_shortbuf+1, 0);
+ _IO_setb (fp, fp->_shortbuf, fp->_shortbuf+1, 0);
}
else
{
fp->_flags &= ~_IO_UNBUFFERED;
- INTUSE(_IO_setb) (fp, p, p+len, 0);
+ _IO_setb (fp, p, p+len, 0);
}
fp->_IO_write_base = fp->_IO_write_ptr = fp->_IO_write_end = 0;
fp->_IO_read_base = fp->_IO_read_ptr = fp->_IO_read_end = 0;
@@ -590,10 +589,10 @@ _IO_default_doallocate (fp)
char *buf;
ALLOC_BUF (buf, _IO_BUFSIZ, EOF);
- INTUSE(_IO_setb) (fp, buf, buf+_IO_BUFSIZ, 1);
+ _IO_setb (fp, buf, buf+_IO_BUFSIZ, 1);
return 1;
}
-INTDEF(_IO_default_doallocate)
+libc_hidden_def (_IO_default_doallocate)
void
_IO_init (fp, flags)
@@ -602,7 +601,7 @@ _IO_init (fp, flags)
{
_IO_no_init (fp, flags, -1, NULL, NULL);
}
-INTDEF(_IO_init)
+libc_hidden_def (_IO_init)
void
_IO_old_init (fp, flags)
@@ -698,14 +697,14 @@ _IO_default_finish (fp, dummy)
fp->_IO_save_base = NULL;
}
- INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) fp);
+ _IO_un_link ((struct _IO_FILE_plus *) fp);
#ifdef _IO_MTSAFE_IO
if (fp->_lock != NULL)
_IO_lock_fini (*fp->_lock);
#endif
}
-INTDEF(_IO_default_finish)
+libc_hidden_def (_IO_default_finish)
_IO_off64_t
_IO_default_seekoff (fp, offset, dir, mode)
@@ -738,7 +737,7 @@ _IO_sputbackc (fp, c)
return result;
}
-INTDEF(_IO_sputbackc)
+libc_hidden_def (_IO_sputbackc)
int
_IO_sungetc (fp)
@@ -798,7 +797,7 @@ _IO_adjust_column (start, line, count)
return line + count - ptr - 1;
return start + count;
}
-INTDEF(_IO_adjust_column)
+libc_hidden_def (_IO_adjust_column)
#if 0
/* Seems not to be needed. --drepper */
@@ -829,7 +828,7 @@ _IO_flush_all_lockp (int do_lock)
#endif
last_stamp = _IO_list_all_stamp;
- fp = (_IO_FILE *) INTUSE(_IO_list_all);
+ fp = (_IO_FILE *) _IO_list_all;
while (fp != NULL)
{
run_fp = fp;
@@ -853,7 +852,7 @@ _IO_flush_all_lockp (int do_lock)
if (last_stamp != _IO_list_all_stamp)
{
/* Something was added to the list. Start all over again. */
- fp = (_IO_FILE *) INTUSE(_IO_list_all);
+ fp = (_IO_FILE *) _IO_list_all;
last_stamp = _IO_list_all_stamp;
}
else
@@ -876,7 +875,7 @@ _IO_flush_all ()
/* We want locking. */
return _IO_flush_all_lockp (1);
}
-INTDEF(_IO_flush_all)
+libc_hidden_def (_IO_flush_all)
void
_IO_flush_all_linebuffered ()
@@ -890,7 +889,7 @@ _IO_flush_all_linebuffered ()
#endif
last_stamp = _IO_list_all_stamp;
- fp = (_IO_FILE *) INTUSE(_IO_list_all);
+ fp = (_IO_FILE *) _IO_list_all;
while (fp != NULL)
{
run_fp = fp;
@@ -905,7 +904,7 @@ _IO_flush_all_linebuffered ()
if (last_stamp != _IO_list_all_stamp)
{
/* Something was added to the list. Start all over again. */
- fp = (_IO_FILE *) INTUSE(_IO_list_all);
+ fp = (_IO_FILE *) _IO_list_all;
last_stamp = _IO_list_all_stamp;
}
else
@@ -917,7 +916,7 @@ _IO_flush_all_linebuffered ()
_IO_cleanup_region_end (0);
#endif
}
-INTDEF(_IO_flush_all_linebuffered)
+libc_hidden_def (_IO_flush_all_linebuffered)
#ifdef _LIBC
weak_alias (_IO_flush_all_linebuffered, _flushlbf)
#endif
@@ -945,7 +944,7 @@ static void
_IO_unbuffer_write (void)
{
struct _IO_FILE *fp;
- for (fp = (_IO_FILE *) INTUSE(_IO_list_all); fp; fp = fp->_chain)
+ for (fp = (_IO_FILE *) _IO_list_all; fp; fp = fp->_chain)
{
if (! (fp->_flags & _IO_UNBUFFERED)
&& (! (fp->_flags & _IO_NO_WRITES)
@@ -1026,7 +1025,7 @@ _IO_init_marker (marker, fp)
{
marker->_sbuf = fp;
if (_IO_in_put_mode (fp))
- INTUSE(_IO_switch_to_get_mode) (fp);
+ _IO_switch_to_get_mode (fp);
if (_IO_in_backup (fp))
marker->_pos = fp->_IO_read_ptr - fp->_IO_read_end;
else
@@ -1132,9 +1131,9 @@ _IO_unsave_markers (fp)
}
if (_IO_have_backup (fp))
- INTUSE(_IO_free_backup_area) (fp);
+ _IO_free_backup_area (fp);
}
-INTDEF(_IO_unsave_markers)
+libc_hidden_def (_IO_unsave_markers)
#if 0
/* Seems not to be needed. --drepper */
@@ -1208,7 +1207,7 @@ _IO_default_pbackfail (fp, c)
}
return (unsigned char) c;
}
-INTDEF(_IO_default_pbackfail)
+libc_hidden_def (_IO_default_pbackfail)
_IO_off64_t
_IO_default_seek (fp, offset, dir)
@@ -1262,7 +1261,7 @@ _IO_default_imbue (fp, locale)
_IO_ITER
_IO_iter_begin()
{
- return (_IO_ITER) INTUSE(_IO_list_all);
+ return (_IO_ITER) _IO_list_all;
}
libc_hidden_def (_IO_iter_begin)
diff --git a/libio/iofclose.c b/libio/iofclose.c
index 1b74945..fc04931 100644
--- a/libio/iofclose.c
+++ b/libio/iofclose.c
@@ -52,11 +52,11 @@ _IO_new_fclose (fp)
/* First unlink the stream. */
if (fp->_IO_file_flags & _IO_IS_FILEBUF)
- INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) fp);
+ _IO_un_link ((struct _IO_FILE_plus *) fp);
_IO_acquire_lock (fp);
if (fp->_IO_file_flags & _IO_IS_FILEBUF)
- status = INTUSE(_IO_file_close_it) (fp);
+ status = _IO_file_close_it (fp);
else
status = fp->_flags & _IO_ERR_SEEN ? -1 : 0;
_IO_release_lock (fp);
@@ -77,7 +77,7 @@ _IO_new_fclose (fp)
else
{
if (_IO_have_backup (fp))
- INTUSE(_IO_free_backup_area) (fp);
+ _IO_free_backup_area (fp);
}
if (fp != _IO_stdin && fp != _IO_stdout && fp != _IO_stderr)
{
diff --git a/libio/iofdopen.c b/libio/iofdopen.c
index f30df18..b4ea76b 100644
--- a/libio/iofdopen.c
+++ b/libio/iofdopen.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993,1994,1997,1998,1999,2000,2002,2003,2010,2012
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -156,14 +155,14 @@ _IO_new_fdopen (fd, mode)
(use_mmap && (read_write & _IO_NO_WRITES)) ? &_IO_file_jumps_maybe_mmap :
#endif
&_IO_file_jumps;
- INTUSE(_IO_file_init) (&new_f->fp);
+ _IO_file_init (&new_f->fp);
#if !_IO_UNIFIED_JUMPTABLES
new_f->fp.vtable = NULL;
#endif
- if (INTUSE(_IO_file_attach) ((_IO_FILE *) &new_f->fp, fd) == NULL)
+ if (_IO_file_attach ((_IO_FILE *) &new_f->fp, fd) == NULL)
{
- INTUSE(_IO_setb) (&new_f->fp.file, NULL, NULL, 0);
- INTUSE(_IO_un_link) (&new_f->fp);
+ _IO_setb (&new_f->fp.file, NULL, NULL, 0);
+ _IO_un_link (&new_f->fp);
free (new_f);
return NULL;
}
@@ -174,7 +173,7 @@ _IO_new_fdopen (fd, mode)
return &new_f->fp.file;
}
-INTDEF2(_IO_new_fdopen, _IO_fdopen)
+libc_hidden_ver (_IO_new_fdopen, _IO_fdopen)
strong_alias (_IO_new_fdopen, __new_fdopen)
versioned_symbol (libc, _IO_new_fdopen, _IO_fdopen, GLIBC_2_1);
diff --git a/libio/iofflush.c b/libio/iofflush.c
index 82d7958..57e0eaf 100644
--- a/libio/iofflush.c
+++ b/libio/iofflush.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997, 1998, 2002, 2003
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -33,7 +32,7 @@ _IO_fflush (fp)
_IO_FILE *fp;
{
if (fp == NULL)
- return INTUSE(_IO_flush_all) ();
+ return _IO_flush_all ();
else
{
int result;
@@ -44,7 +43,7 @@ _IO_fflush (fp)
return result;
}
}
-INTDEF(_IO_fflush)
+libc_hidden_def (_IO_fflush)
#ifdef weak_alias
weak_alias (_IO_fflush, fflush)
diff --git a/libio/iofflush_u.c b/libio/iofflush_u.c
index f60e684..353c7ab 100644
--- a/libio/iofflush_u.c
+++ b/libio/iofflush_u.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -32,7 +32,7 @@ fflush_unlocked (fp)
_IO_FILE *fp;
{
if (fp == NULL)
- return INTUSE(_IO_flush_all) ();
+ return _IO_flush_all ();
else
{
CHECK_FILE (fp, EOF);
diff --git a/libio/iofgets.c b/libio/iofgets.c
index a48edfc..984cb86 100644
--- a/libio/iofgets.c
+++ b/libio/iofgets.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997, 1998, 1999, 2002, 2003, 2005
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -54,7 +53,7 @@ _IO_fgets (buf, n, fp)
case. We return an error only when there is a new error. */
old_error = fp->_IO_file_flags & _IO_ERR_SEEN;
fp->_IO_file_flags &= ~_IO_ERR_SEEN;
- count = INTUSE(_IO_getline) (fp, buf, n - 1, '\n', 1);
+ count = _IO_getline (fp, buf, n - 1, '\n', 1);
/* If we read in some bytes and errno is EAGAIN, that error will
be reported for next read. */
if (count == 0 || ((fp->_IO_file_flags & _IO_ERR_SEEN)
diff --git a/libio/iofgets_u.c b/libio/iofgets_u.c
index b8f15e4..e524943 100644
--- a/libio/iofgets_u.c
+++ b/libio/iofgets_u.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1995-1998,2002,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -52,7 +52,7 @@ fgets_unlocked (buf, n, fp)
case. We return an error only when there is a new error. */
old_error = fp->_IO_file_flags & _IO_ERR_SEEN;
fp->_IO_file_flags &= ~_IO_ERR_SEEN;
- count = INTUSE(_IO_getline) (fp, buf, n - 1, '\n', 1);
+ count = _IO_getline (fp, buf, n - 1, '\n', 1);
/* If we read in some bytes and errno is EAGAIN, that error will
be reported for next read. */
if (count == 0 || ((fp->_IO_file_flags & _IO_ERR_SEEN)
diff --git a/libio/iofopen.c b/libio/iofopen.c
index 491d443..8edd32e 100644
--- a/libio/iofopen.c
+++ b/libio/iofopen.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993,1997,1998,1999,2000,2002,2003,2012
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -83,15 +82,14 @@ __fopen_internal (filename, mode, is32)
_IO_no_init (&new_f->fp.file, 1, 0, NULL, NULL);
#endif
_IO_JUMPS (&new_f->fp) = &_IO_file_jumps;
- INTUSE(_IO_file_init) (&new_f->fp);
+ _IO_file_init (&new_f->fp);
#if !_IO_UNIFIED_JUMPTABLES
new_f->fp.vtable = NULL;
#endif
- if (INTUSE(_IO_file_fopen) ((_IO_FILE *) new_f, filename, mode, is32)
- != NULL)
+ if (_IO_file_fopen ((_IO_FILE *) new_f, filename, mode, is32) != NULL)
return __fopen_maybe_mmap (&new_f->fp.file);
- INTUSE(_IO_un_link) (&new_f->fp);
+ _IO_un_link (&new_f->fp);
free (new_f);
return NULL;
}
diff --git a/libio/iofopncook.c b/libio/iofopncook.c
index b95632f..7797e8e 100644
--- a/libio/iofopncook.c
+++ b/libio/iofopncook.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993,95,97,99,2000,2002,2004, 2005, 2010
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -113,24 +112,24 @@ _IO_cookie_seekoff (fp, offset, dir, mode)
/* We must force the fileops code to always use seek to determine
the position. */
fp->_offset = _IO_pos_BAD;
- return INTUSE(_IO_file_seekoff) (fp, offset, dir, mode);
+ return _IO_file_seekoff (fp, offset, dir, mode);
}
static const struct _IO_jump_t _IO_cookie_jumps = {
JUMP_INIT_DUMMY,
- JUMP_INIT(finish, INTUSE(_IO_file_finish)),
- JUMP_INIT(overflow, INTUSE(_IO_file_overflow)),
- JUMP_INIT(underflow, INTUSE(_IO_file_underflow)),
- JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT(pbackfail, INTUSE(_IO_default_pbackfail)),
- JUMP_INIT(xsputn, INTUSE(_IO_file_xsputn)),
- JUMP_INIT(xsgetn, INTUSE(_IO_default_xsgetn)),
+ JUMP_INIT(finish, _IO_file_finish),
+ JUMP_INIT(overflow, _IO_file_overflow),
+ JUMP_INIT(underflow, _IO_file_underflow),
+ JUMP_INIT(uflow, _IO_default_uflow),
+ JUMP_INIT(pbackfail, _IO_default_pbackfail),
+ JUMP_INIT(xsputn, _IO_file_xsputn),
+ JUMP_INIT(xsgetn, _IO_default_xsgetn),
JUMP_INIT(seekoff, _IO_cookie_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
- JUMP_INIT(setbuf, INTUSE(_IO_file_setbuf)),
- JUMP_INIT(sync, INTUSE(_IO_file_sync)),
- JUMP_INIT(doallocate, INTUSE(_IO_file_doallocate)),
+ JUMP_INIT(setbuf, _IO_file_setbuf),
+ JUMP_INIT(sync, _IO_file_sync),
+ JUMP_INIT(doallocate, _IO_file_doallocate),
JUMP_INIT(read, _IO_cookie_read),
JUMP_INIT(write, _IO_cookie_write),
JUMP_INIT(seek, _IO_cookie_seek),
@@ -145,13 +144,13 @@ void
_IO_cookie_init (struct _IO_cookie_file *cfile, int read_write,
void *cookie, _IO_cookie_io_functions_t io_functions)
{
- INTUSE(_IO_init) (&cfile->__fp.file, 0);
+ _IO_init (&cfile->__fp.file, 0);
_IO_JUMPS (&cfile->__fp) = &_IO_cookie_jumps;
cfile->__cookie = cookie;
cfile->__io_functions = io_functions;
- INTUSE(_IO_file_init) (&cfile->__fp);
+ _IO_file_init (&cfile->__fp);
_IO_mask_flags (&cfile->__fp.file, read_write,
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
@@ -238,18 +237,18 @@ _IO_old_cookie_seek (fp, offset, dir)
static const struct _IO_jump_t _IO_old_cookie_jumps = {
JUMP_INIT_DUMMY,
- JUMP_INIT(finish, INTUSE(_IO_file_finish)),
- JUMP_INIT(overflow, INTUSE(_IO_file_overflow)),
- JUMP_INIT(underflow, INTUSE(_IO_file_underflow)),
- JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT(pbackfail, INTUSE(_IO_default_pbackfail)),
- JUMP_INIT(xsputn, INTUSE(_IO_file_xsputn)),
- JUMP_INIT(xsgetn, INTUSE(_IO_default_xsgetn)),
+ JUMP_INIT(finish, _IO_file_finish),
+ JUMP_INIT(overflow, _IO_file_overflow),
+ JUMP_INIT(underflow, _IO_file_underflow),
+ JUMP_INIT(uflow, _IO_default_uflow),
+ JUMP_INIT(pbackfail, _IO_default_pbackfail),
+ JUMP_INIT(xsputn, _IO_file_xsputn),
+ JUMP_INIT(xsgetn, _IO_default_xsgetn),
JUMP_INIT(seekoff, _IO_cookie_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
- JUMP_INIT(setbuf, INTUSE(_IO_file_setbuf)),
- JUMP_INIT(sync, INTUSE(_IO_file_sync)),
- JUMP_INIT(doallocate, INTUSE(_IO_file_doallocate)),
+ JUMP_INIT(setbuf, _IO_file_setbuf),
+ JUMP_INIT(sync, _IO_file_sync),
+ JUMP_INIT(doallocate, _IO_file_doallocate),
JUMP_INIT(read, _IO_cookie_read),
JUMP_INIT(write, _IO_cookie_write),
JUMP_INIT(seek, _IO_old_cookie_seek),
diff --git a/libio/iofread.c b/libio/iofread.c
index 0c980f1..1f04aae 100644
--- a/libio/iofread.c
+++ b/libio/iofread.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997, 1998, 1999, 2002, 2003
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -40,11 +39,11 @@ _IO_fread (buf, size, count, fp)
if (bytes_requested == 0)
return 0;
_IO_acquire_lock (fp);
- bytes_read = INTUSE(_IO_sgetn) (fp, (char *) buf, bytes_requested);
+ bytes_read = _IO_sgetn (fp, (char *) buf, bytes_requested);
_IO_release_lock (fp);
return bytes_requested == bytes_read ? count : bytes_read / size;
}
-INTDEF(_IO_fread)
+libc_hidden_def (_IO_fread)
#ifdef weak_alias
weak_alias (_IO_fread, fread)
diff --git a/libio/iofread_u.c b/libio/iofread_u.c
index 587e7cb..a314d22 100644
--- a/libio/iofread_u.c
+++ b/libio/iofread_u.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997, 1998, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -41,7 +41,7 @@ fread_unlocked (buf, size, count, fp)
CHECK_FILE (fp, 0);
if (bytes_requested == 0)
return 0;
- bytes_read = INTUSE(_IO_sgetn) (fp, (char *) buf, bytes_requested);
+ bytes_read = _IO_sgetn (fp, (char *) buf, bytes_requested);
return bytes_requested == bytes_read ? count : bytes_read / size;
}
libc_hidden_def (fread_unlocked)
diff --git a/libio/ioftell.c b/libio/ioftell.c
index 0899352..a1e0618 100644
--- a/libio/ioftell.c
+++ b/libio/ioftell.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995-2000, 2001, 2002, 2003, 2004
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -61,7 +60,7 @@ _IO_ftell (fp)
}
return pos;
}
-INTDEF(_IO_ftell)
+libc_hidden_def (_IO_ftell)
#ifdef weak_alias
weak_alias (_IO_ftell, ftell)
diff --git a/libio/iofwrite.c b/libio/iofwrite.c
index ac0194f..d4610f7 100644
--- a/libio/iofwrite.c
+++ b/libio/iofwrite.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2008
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -52,7 +51,7 @@ _IO_fwrite (buf, size, count, fp)
else
return written / size;
}
-INTDEF(_IO_fwrite)
+libc_hidden_def (_IO_fwrite)
#ifdef weak_alias
# include <stdio.h>
diff --git a/libio/iogetline.c b/libio/iogetline.c
index deeefb6..f097f80 100644
--- a/libio/iogetline.c
+++ b/libio/iogetline.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993,1997,1998,2000,2001,2002,2005
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -38,10 +37,9 @@ _IO_getline (fp, buf, n, delim, extract_delim)
int delim;
int extract_delim;
{
- return INTUSE(_IO_getline_info) (fp, buf, n, delim, extract_delim,
- (int *) 0);
+ return _IO_getline_info (fp, buf, n, delim, extract_delim, (int *) 0);
}
-INTDEF(_IO_getline)
+libc_hidden_def (_IO_getline)
/* Algorithm based on that used by Berkeley pre-4.4 fgets implementation.
@@ -82,7 +80,7 @@ _IO_getline_info (fp, buf, n, delim, extract_delim, eof)
if (extract_delim > 0)
*ptr++ = c;
else if (extract_delim < 0)
- INTUSE(_IO_sputbackc) (fp, c);
+ _IO_sputbackc (fp, c);
if (extract_delim > 0)
++len;
return ptr - buf;
@@ -118,6 +116,6 @@ _IO_getline_info (fp, buf, n, delim, extract_delim, eof)
}
return ptr - buf;
}
-INTDEF(_IO_getline_info)
+libc_hidden_def (_IO_getline_info)
#endif /* Defined _LIBC || !_G_HAVE_IO_GETLINE_INFO */
diff --git a/libio/iogets.c b/libio/iogets.c
index 39103dc..77353fe 100644
--- a/libio/iogets.c
+++ b/libio/iogets.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1996,1997,1998,2002,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -52,7 +52,7 @@ _IO_gets (buf)
int old_error = _IO_stdin->_IO_file_flags & _IO_ERR_SEEN;
_IO_stdin->_IO_file_flags &= ~_IO_ERR_SEEN;
buf[0] = (char) ch;
- count = INTUSE(_IO_getline) (_IO_stdin, buf + 1, INT_MAX, '\n', 0) + 1;
+ count = _IO_getline (_IO_stdin, buf + 1, INT_MAX, '\n', 0) + 1;
if (_IO_stdin->_IO_file_flags & _IO_ERR_SEEN)
{
retval = NULL;
diff --git a/libio/iogetwline.c b/libio/iogetwline.c
index 167d32a..598ece1 100644
--- a/libio/iogetwline.c
+++ b/libio/iogetwline.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1997-2000,2002,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -85,7 +85,7 @@ _IO_getwline_info (fp, buf, n, delim, extract_delim, eof)
if (extract_delim > 0)
*ptr++ = wc;
else if (extract_delim < 0)
- INTUSE(_IO_sputbackc) (fp, wc);
+ _IO_sputbackc (fp, wc);
if (extract_delim > 0)
++len;
return ptr - buf;
diff --git a/libio/iolibio.h b/libio/iolibio.h
index 00a4f56..f215fce 100644
--- a/libio/iolibio.h
+++ b/libio/iolibio.h
@@ -11,9 +11,11 @@ extern int _IO_fclose (_IO_FILE*);
extern int _IO_new_fclose (_IO_FILE*);
extern int _IO_old_fclose (_IO_FILE*);
extern _IO_FILE *_IO_fdopen (int, const char*) __THROW;
+libc_hidden_proto (_IO_fdopen)
extern _IO_FILE *_IO_old_fdopen (int, const char*) __THROW;
extern _IO_FILE *_IO_new_fdopen (int, const char*) __THROW;
extern int _IO_fflush (_IO_FILE*);
+libc_hidden_proto (_IO_fflush)
extern int _IO_fgetpos (_IO_FILE*, _IO_fpos_t*);
extern int _IO_fgetpos64 (_IO_FILE*, _IO_fpos64_t*);
extern char* _IO_fgets (char*, int, _IO_FILE*);
@@ -29,20 +31,26 @@ libc_hidden_proto (_IO_fputs)
extern int _IO_fsetpos (_IO_FILE*, const _IO_fpos_t *);
extern int _IO_fsetpos64 (_IO_FILE*, const _IO_fpos64_t *);
extern long int _IO_ftell (_IO_FILE*);
+libc_hidden_proto (_IO_ftell)
extern _IO_size_t _IO_fread (void*, _IO_size_t, _IO_size_t, _IO_FILE*);
+libc_hidden_proto (_IO_fread)
extern _IO_size_t _IO_fwrite (const void*, _IO_size_t, _IO_size_t, _IO_FILE*);
+libc_hidden_proto (_IO_fwrite)
extern char* _IO_gets (char*);
extern void _IO_perror (const char*) __THROW;
extern int _IO_printf (const char*, ...);
extern int _IO_puts (const char*);
extern int _IO_scanf (const char*, ...);
extern void _IO_setbuffer (_IO_FILE *, char*, _IO_size_t) __THROW;
+libc_hidden_proto (_IO_setbuffer)
extern int _IO_setvbuf (_IO_FILE*, char*, int, _IO_size_t) __THROW;
+libc_hidden_proto (_IO_setvbuf)
extern int _IO_sscanf (const char*, const char*, ...) __THROW;
extern int _IO_sprintf (char *, const char*, ...) __THROW;
extern int _IO_ungetc (int, _IO_FILE*) __THROW;
extern int _IO_vsscanf (const char *, const char *, _IO_va_list) __THROW;
extern int _IO_vsprintf (char*, const char*, _IO_va_list) __THROW;
+libc_hidden_proto (_IO_vsprintf)
extern int _IO_vswprintf (wchar_t*, _IO_size_t, const wchar_t*, _IO_va_list)
__THROW;
@@ -60,15 +68,15 @@ extern int _IO_obstack_printf (struct obstack *, const char *, ...) __THROW;
#define _IO_rewind(FILE) \
(void) _IO_seekoff_unlocked (FILE, 0, 0, _IOS_INPUT|_IOS_OUTPUT)
#define _IO_vprintf(FORMAT, ARGS) \
- INTUSE(_IO_vfprintf) (_IO_stdout, FORMAT, ARGS)
+ _IO_vfprintf (_IO_stdout, FORMAT, ARGS)
#define _IO_freopen(FILENAME, MODE, FP) \
- (INTUSE(_IO_file_close_it)(FP), \
- INTUSE(_IO_file_fopen)(FP, FILENAME, MODE, 1))
+ (_IO_file_close_it (FP), \
+ _IO_file_fopen (FP, FILENAME, MODE, 1))
#define _IO_old_freopen(FILENAME, MODE, FP) \
(_IO_old_file_close_it (FP), _IO_old_file_fopen(FP, FILENAME, MODE))
#define _IO_freopen64(FILENAME, MODE, FP) \
- (INTUSE(_IO_file_close_it)(FP), \
- INTUSE(_IO_file_fopen)(FP, FILENAME, MODE, 0))
+ (_IO_file_close_it (FP), \
+ _IO_file_fopen (FP, FILENAME, MODE, 0))
#define _IO_fileno(FP) ((FP)->_fileno)
extern _IO_FILE* _IO_popen (const char*, const char*) __THROW;
extern _IO_FILE* _IO_new_popen (const char*, const char*) __THROW;
@@ -76,25 +84,12 @@ extern _IO_FILE* _IO_old_popen (const char*, const char*) __THROW;
extern int __new_pclose (_IO_FILE *) __THROW;
extern int __old_pclose (_IO_FILE *) __THROW;
#define _IO_pclose _IO_fclose
-#define _IO_setbuf(_FP, _BUF) INTUSE(_IO_setbuffer)(_FP, _BUF, _IO_BUFSIZ)
-#define _IO_setlinebuf(_FP) INTUSE(_IO_setvbuf)(_FP, NULL, 1, 0)
+#define _IO_setbuf(_FP, _BUF) _IO_setbuffer (_FP, _BUF, _IO_BUFSIZ)
+#define _IO_setlinebuf(_FP) _IO_setvbuf (_FP, NULL, 1, 0)
_IO_FILE *__new_freopen (const char *, const char *, _IO_FILE *) __THROW;
_IO_FILE *__old_freopen (const char *, const char *, _IO_FILE *) __THROW;
-/* Prototype for functions with alternative entry point. */
-extern void _IO_setbuffer_internal (_IO_FILE *, char*, _IO_size_t) __THROW;
-extern _IO_size_t _IO_fread_internal (void*, _IO_size_t, _IO_size_t, _IO_FILE*)
- __THROW;
-extern _IO_FILE *_IO_fdopen_internal (int, const char*) __THROW;
-extern int _IO_vsprintf_internal (char*, const char*, _IO_va_list) __THROW;
-extern int _IO_fflush_internal (_IO_FILE*);
-extern _IO_size_t _IO_fwrite_internal (const void*, _IO_size_t,
- _IO_size_t, _IO_FILE*);
-extern long int _IO_ftell_internal (_IO_FILE*);
-extern int _IO_fputs_internal (const char*, _IO_FILE*);
-extern int _IO_setvbuf_internal (_IO_FILE*, char*, int, _IO_size_t) __THROW;
-
#ifdef __cplusplus
}
#endif
diff --git a/libio/iopadn.c b/libio/iopadn.c
index 17670ef..7e37450 100644
--- a/libio/iopadn.c
+++ b/libio/iopadn.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -69,4 +69,4 @@ _IO_padn (fp, pad, count)
}
return written;
}
-INTDEF(_IO_padn)
+libc_hidden_def (_IO_padn)
diff --git a/libio/iopopen.c b/libio/iopopen.c
index 967473d..4f67e8c 100644
--- a/libio/iopopen.c
+++ b/libio/iopopen.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1997-2002, 2003, 2004, 2007, 2008, 2012
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Per Bothner <bothner@cygnus.com>.
@@ -300,7 +299,7 @@ _IO_new_popen (command, mode)
new_f->fpx.file.file._lock = &new_f->lock;
#endif
fp = &new_f->fpx.file.file;
- INTUSE(_IO_init) (fp, 0);
+ _IO_init (fp, 0);
_IO_JUMPS (&new_f->fpx.file) = &_IO_proc_jumps;
_IO_new_file_init (&new_f->fpx.file);
#if !_IO_UNIFIED_JUMPTABLES
@@ -308,7 +307,7 @@ _IO_new_popen (command, mode)
#endif
if (_IO_new_proc_open (fp, command, mode) != NULL)
return (_IO_FILE *) &new_f->fpx.file;
- INTUSE(_IO_un_link) (&new_f->fpx.file);
+ _IO_un_link (&new_f->fpx.file);
free (new_f);
return NULL;
}
@@ -367,20 +366,20 @@ static const struct _IO_jump_t _IO_proc_jumps = {
JUMP_INIT(finish, _IO_new_file_finish),
JUMP_INIT(overflow, _IO_new_file_overflow),
JUMP_INIT(underflow, _IO_new_file_underflow),
- JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT(pbackfail, INTUSE(_IO_default_pbackfail)),
+ JUMP_INIT(uflow, _IO_default_uflow),
+ JUMP_INIT(pbackfail, _IO_default_pbackfail),
JUMP_INIT(xsputn, _IO_new_file_xsputn),
- JUMP_INIT(xsgetn, INTUSE(_IO_default_xsgetn)),
+ JUMP_INIT(xsgetn, _IO_default_xsgetn),
JUMP_INIT(seekoff, _IO_new_file_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, _IO_new_file_setbuf),
JUMP_INIT(sync, _IO_new_file_sync),
- JUMP_INIT(doallocate, INTUSE(_IO_file_doallocate)),
- JUMP_INIT(read, INTUSE(_IO_file_read)),
+ JUMP_INIT(doallocate, _IO_file_doallocate),
+ JUMP_INIT(read, _IO_file_read),
JUMP_INIT(write, _IO_new_file_write),
- JUMP_INIT(seek, INTUSE(_IO_file_seek)),
+ JUMP_INIT(seek, _IO_file_seek),
JUMP_INIT(close, _IO_new_proc_close),
- JUMP_INIT(stat, INTUSE(_IO_file_stat)),
+ JUMP_INIT(stat, _IO_file_stat),
JUMP_INIT(showmanyc, _IO_default_showmanyc),
JUMP_INIT(imbue, _IO_default_imbue)
};
diff --git a/libio/ioseekoff.c b/libio/ioseekoff.c
index 4fdebd4..7d5cf61 100644
--- a/libio/ioseekoff.c
+++ b/libio/ioseekoff.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -62,9 +61,9 @@ _IO_seekoff_unlocked (fp, offset, dir, mode)
abort ();
}
if (_IO_fwide (fp, 0) < 0)
- INTUSE(_IO_free_backup_area) (fp);
+ _IO_free_backup_area (fp);
else
- INTUSE(_IO_free_wbackup_area) (fp);
+ _IO_free_wbackup_area (fp);
}
return _IO_SEEKOFF (fp, offset, dir, mode);
diff --git a/libio/ioseekpos.c b/libio/ioseekpos.c
index 4d8bb17..0f0aff9 100644
--- a/libio/ioseekpos.c
+++ b/libio/ioseekpos.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1997-1999,2002,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -38,12 +38,12 @@ _IO_seekpos_unlocked (fp, pos, mode)
if (_IO_fwide (fp, 0) <= 0)
{
if (_IO_have_backup (fp))
- INTUSE(_IO_free_backup_area) (fp);
+ _IO_free_backup_area (fp);
}
else
{
if (_IO_have_wbackup (fp))
- INTUSE(_IO_free_wbackup_area) (fp);
+ _IO_free_wbackup_area (fp);
}
return _IO_SEEKOFF (fp, pos, 0, mode);
diff --git a/libio/iosetbuffer.c b/libio/iosetbuffer.c
index ac51d00..2b2d461 100644
--- a/libio/iosetbuffer.c
+++ b/libio/iosetbuffer.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -44,7 +43,7 @@ _IO_setbuffer (fp, buf, size)
(void) _IO_WSETBUF (fp, buf, size);
_IO_release_lock (fp);
}
-INTDEF(_IO_setbuffer)
+libc_hidden_def (_IO_setbuffer)
#ifdef weak_alias
weak_alias (_IO_setbuffer, setbuffer)
diff --git a/libio/iosetvbuf.c b/libio/iosetvbuf.c
index 65248ff..3df9d23 100644
--- a/libio/iosetvbuf.c
+++ b/libio/iosetvbuf.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -98,7 +97,7 @@ unlock_return:
_IO_release_lock (fp);
return result;
}
-INTDEF(_IO_setvbuf)
+libc_hidden_def (_IO_setvbuf)
#ifdef weak_alias
weak_alias (_IO_setvbuf, setvbuf)
diff --git a/libio/ioungetc.c b/libio/ioungetc.c
index 7ba087a..7ebd3e5 100644
--- a/libio/ioungetc.c
+++ b/libio/ioungetc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1996,1997,1998,2002,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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 @@ _IO_ungetc (c, fp)
if (c == EOF)
return EOF;
_IO_acquire_lock (fp);
- result = INTUSE(_IO_sputbackc) (fp, (unsigned char) c);
+ result = _IO_sputbackc (fp, (unsigned char) c);
_IO_release_lock (fp);
return result;
}
diff --git a/libio/ioungetwc.c b/libio/ioungetwc.c
index 47d5fba..9ee9a28 100644
--- a/libio/ioungetwc.c
+++ b/libio/ioungetwc.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2006
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -40,7 +39,7 @@ ungetwc (c, fp)
if (c == WEOF)
result = WEOF;
else
- result = INTUSE(_IO_sputbackwc) (fp, c);
+ result = _IO_sputbackwc (fp, c);
_IO_release_lock (fp);
return result;
}
diff --git a/libio/iovdprintf.c b/libio/iovdprintf.c
index c6fdccd..43dbb87 100644
--- a/libio/iovdprintf.c
+++ b/libio/iovdprintf.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1995, 1997-2000, 2001, 2002, 2003, 2006, 2010
- Free Software Foundation, Inc.
+/* Copyright (C) 1995-2012 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
@@ -43,13 +42,13 @@ _IO_vdprintf (d, format, arg)
#endif
_IO_no_init (&tmpfil.file, _IO_USER_LOCK, 0, &wd, &_IO_wfile_jumps);
_IO_JUMPS (&tmpfil) = &_IO_file_jumps;
- INTUSE(_IO_file_init) (&tmpfil);
+ _IO_file_init (&tmpfil);
#if !_IO_UNIFIED_JUMPTABLES
tmpfil.vtable = NULL;
#endif
- if (INTUSE(_IO_file_attach) (&tmpfil.file, d) == NULL)
+ if (_IO_file_attach (&tmpfil.file, d) == NULL)
{
- INTUSE(_IO_un_link) (&tmpfil);
+ _IO_un_link (&tmpfil);
return EOF;
}
tmpfil.file._flags |= _IO_DELETE_DONT_CLOSE;
@@ -57,7 +56,7 @@ _IO_vdprintf (d, format, arg)
_IO_mask_flags (&tmpfil.file, _IO_NO_READS,
_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING);
- done = INTUSE(_IO_vfprintf) (&tmpfil.file, format, arg);
+ done = _IO_vfprintf (&tmpfil.file, format, arg);
if (done != EOF && _IO_do_flush (&tmpfil.file) == EOF)
done = EOF;
diff --git a/libio/iovsprintf.c b/libio/iovsprintf.c
index f5a2fc1..f50b961 100644
--- a/libio/iovsprintf.c
+++ b/libio/iovsprintf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1997-2003, 2006, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -39,11 +39,11 @@ __IO_vsprintf (char *string, const char *format, _IO_va_list args)
_IO_no_init (&sf._sbf._f, _IO_USER_LOCK, -1, NULL, NULL);
_IO_JUMPS (&sf._sbf) = &_IO_str_jumps;
_IO_str_init_static_internal (&sf, string, -1, string);
- ret = INTUSE(_IO_vfprintf) (&sf._sbf._f, format, args);
+ ret = _IO_vfprintf (&sf._sbf._f, format, args);
_IO_putc_unlocked ('\0', &sf._sbf._f);
return ret;
}
-INTDEF2(__IO_vsprintf, _IO_vsprintf)
+ldbl_hidden_def (__IO_vsprintf, _IO_vsprintf)
ldbl_strong_alias (__IO_vsprintf, _IO_vsprintf)
ldbl_weak_alias (__IO_vsprintf, vsprintf)
diff --git a/libio/iovsscanf.c b/libio/iovsscanf.c
index 8afc500..2ae586c 100644
--- a/libio/iovsscanf.c
+++ b/libio/iovsscanf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1997-2003, 2006, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -41,7 +41,7 @@ _IO_vsscanf (string, format, args)
_IO_no_init (&sf._sbf._f, _IO_USER_LOCK, -1, NULL, NULL);
_IO_JUMPS (&sf._sbf) = &_IO_str_jumps;
_IO_str_init_static_internal (&sf, (char*)string, 0, NULL);
- ret = INTUSE(_IO_vfscanf) (&sf._sbf._f, format, args, NULL);
+ ret = _IO_vfscanf (&sf._sbf._f, format, args, NULL);
return ret;
}
ldbl_weak_alias (_IO_vsscanf, __vsscanf)
diff --git a/libio/libioP.h b/libio/libioP.h
index 8b8ed9c..486c670 100644
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -41,15 +41,6 @@
/* Control of exported symbols. Used in glibc. By default we don't
do anything. */
-#ifndef INTUSE
-# define INTUSE(name) name
-#endif
-#ifndef INTDEF
-# define INTDEF(name)
-#endif
-#ifndef INTDEF2
-# define INTDEF2(name)
-#endif
#ifndef libc_hidden_proto
# define libc_hidden_proto(name)
#endif
@@ -380,24 +371,41 @@ typedef struct _IO_FILE *_IO_ITER;
extern void _IO_switch_to_main_get_area (_IO_FILE *) __THROW;
extern void _IO_switch_to_backup_area (_IO_FILE *) __THROW;
extern int _IO_switch_to_get_mode (_IO_FILE *);
+libc_hidden_proto (_IO_switch_to_get_mode)
extern void _IO_init (_IO_FILE *, int) __THROW;
+libc_hidden_proto (_IO_init)
extern int _IO_sputbackc (_IO_FILE *, int) __THROW;
+libc_hidden_proto (_IO_sputbackc)
extern int _IO_sungetc (_IO_FILE *) __THROW;
extern void _IO_un_link (struct _IO_FILE_plus *) __THROW;
+libc_hidden_proto (_IO_un_link)
extern void _IO_link_in (struct _IO_FILE_plus *) __THROW;
+libc_hidden_proto (_IO_link_in)
extern void _IO_doallocbuf (_IO_FILE *) __THROW;
+libc_hidden_proto (_IO_doallocbuf)
extern void _IO_unsave_markers (_IO_FILE *) __THROW;
+libc_hidden_proto (_IO_unsave_markers)
extern void _IO_setb (_IO_FILE *, char *, char *, int) __THROW;
+libc_hidden_proto (_IO_setb)
extern unsigned _IO_adjust_column (unsigned, const char *, int) __THROW;
+libc_hidden_proto (_IO_adjust_column)
#define _IO_sputn(__fp, __s, __n) _IO_XSPUTN (__fp, __s, __n)
+_IO_ssize_t _IO_least_wmarker (_IO_FILE *, wchar_t *) __THROW;
+libc_hidden_proto (_IO_least_wmarker)
extern void _IO_switch_to_main_wget_area (_IO_FILE *) __THROW;
+libc_hidden_proto (_IO_switch_to_main_wget_area)
extern void _IO_switch_to_wbackup_area (_IO_FILE *) __THROW;
+libc_hidden_proto (_IO_switch_to_wbackup_area)
extern int _IO_switch_to_wget_mode (_IO_FILE *);
+libc_hidden_proto (_IO_switch_to_wget_mode)
extern void _IO_wsetb (_IO_FILE *, wchar_t *, wchar_t *, int) __THROW;
+libc_hidden_proto (_IO_wsetb)
extern wint_t _IO_sputbackwc (_IO_FILE *, wint_t) __THROW;
+libc_hidden_proto (_IO_sputbackwc)
extern wint_t _IO_sungetwc (_IO_FILE *) __THROW;
extern void _IO_wdoallocbuf (_IO_FILE *) __THROW;
+libc_hidden_proto (_IO_wdoallocbuf)
extern void _IO_unsave_wmarkers (_IO_FILE *) __THROW;
extern unsigned _IO_adjust_wcolumn (unsigned, const wchar_t *, int) __THROW;
@@ -434,18 +442,30 @@ libc_hidden_proto (_IO_list_resetlock)
extern int _IO_default_underflow (_IO_FILE *) __THROW;
extern int _IO_default_uflow (_IO_FILE *);
+libc_hidden_proto (_IO_default_uflow)
extern wint_t _IO_wdefault_uflow (_IO_FILE *);
+libc_hidden_proto (_IO_wdefault_uflow)
extern int _IO_default_doallocate (_IO_FILE *) __THROW;
+libc_hidden_proto (_IO_default_doallocate)
extern int _IO_wdefault_doallocate (_IO_FILE *) __THROW;
+libc_hidden_proto (_IO_wdefault_doallocate)
extern void _IO_default_finish (_IO_FILE *, int) __THROW;
+libc_hidden_proto (_IO_default_finish)
extern void _IO_wdefault_finish (_IO_FILE *, int) __THROW;
+libc_hidden_proto (_IO_wdefault_finish)
extern int _IO_default_pbackfail (_IO_FILE *, int) __THROW;
+libc_hidden_proto (_IO_default_pbackfail)
extern wint_t _IO_wdefault_pbackfail (_IO_FILE *, wint_t) __THROW;
+libc_hidden_proto (_IO_wdefault_pbackfail)
extern _IO_FILE* _IO_default_setbuf (_IO_FILE *, char *, _IO_ssize_t);
extern _IO_size_t _IO_default_xsputn (_IO_FILE *, const void *, _IO_size_t);
+libc_hidden_proto (_IO_default_xsputn)
extern _IO_size_t _IO_wdefault_xsputn (_IO_FILE *, const void *, _IO_size_t);
+libc_hidden_proto (_IO_wdefault_xsputn)
extern _IO_size_t _IO_default_xsgetn (_IO_FILE *, void *, _IO_size_t);
+libc_hidden_proto (_IO_default_xsgetn)
extern _IO_size_t _IO_wdefault_xsgetn (_IO_FILE *, void *, _IO_size_t);
+libc_hidden_proto (_IO_wdefault_xsgetn)
extern _IO_off64_t _IO_default_seekoff (_IO_FILE *, _IO_off64_t, int, int)
__THROW;
extern _IO_off64_t _IO_default_seekpos (_IO_FILE *, _IO_off64_t, int);
@@ -473,13 +493,17 @@ extern const struct _IO_jump_t _IO_str_jumps attribute_hidden;
extern const struct _IO_jump_t _IO_wstr_jumps attribute_hidden;
extern const struct _IO_codecvt __libio_codecvt attribute_hidden;
extern int _IO_do_write (_IO_FILE *, const char *, _IO_size_t);
+libc_hidden_proto (_IO_do_write)
extern int _IO_new_do_write (_IO_FILE *, const char *, _IO_size_t);
extern int _IO_old_do_write (_IO_FILE *, const char *, _IO_size_t);
extern int _IO_wdo_write (_IO_FILE *, const wchar_t *, _IO_size_t);
+libc_hidden_proto (_IO_wdo_write)
extern int _IO_flush_all_lockp (int);
extern int _IO_flush_all (void);
+libc_hidden_proto (_IO_flush_all)
extern int _IO_cleanup (void);
extern void _IO_flush_all_linebuffered (void);
+libc_hidden_proto (_IO_flush_all_linebuffered)
extern int _IO_new_fgetpos (_IO_FILE *, _IO_fpos_t *);
extern int _IO_old_fgetpos (_IO_FILE *, _IO_fpos_t *);
extern int _IO_new_fsetpos (_IO_FILE *, const _IO_fpos_t *);
@@ -494,15 +518,15 @@ extern void _IO_old_init (_IO_FILE *fp, int flags) __THROW;
#if defined _LIBC || defined _GLIBCPP_USE_WCHAR_T
# define _IO_do_flush(_f) \
((_f)->_mode <= 0 \
- ? INTUSE(_IO_do_write)(_f, (_f)->_IO_write_base, \
- (_f)->_IO_write_ptr-(_f)->_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)))
+ ? _IO_do_write(_f, (_f)->_IO_write_base, \
+ (_f)->_IO_write_ptr-(_f)->_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)))
#else
# define _IO_do_flush(_f) \
- INTUSE(_IO_do_write)(_f, (_f)->_IO_write_base, \
- (_f)->_IO_write_ptr-(_f)->_IO_write_base)
+ _IO_do_write(_f, (_f)->_IO_write_base, \
+ (_f)->_IO_write_ptr-(_f)->_IO_write_base)
#endif
#define _IO_old_do_flush(_f) \
_IO_old_do_write(_f, (_f)->_IO_write_base, \
@@ -533,31 +557,48 @@ extern void _IO_old_init (_IO_FILE *fp, int flags) __THROW;
/* Jumptable functions for files. */
extern int _IO_file_doallocate (_IO_FILE *) __THROW;
+libc_hidden_proto (_IO_file_doallocate)
extern _IO_FILE* _IO_file_setbuf (_IO_FILE *, char *, _IO_ssize_t);
+libc_hidden_proto (_IO_file_setbuf)
extern _IO_off64_t _IO_file_seekoff (_IO_FILE *, _IO_off64_t, int, int);
+libc_hidden_proto (_IO_file_seekoff)
extern _IO_off64_t _IO_file_seekoff_mmap (_IO_FILE *, _IO_off64_t, int, int)
__THROW;
extern _IO_size_t _IO_file_xsputn (_IO_FILE *, const void *, _IO_size_t);
+libc_hidden_proto (_IO_file_xsputn)
extern _IO_size_t _IO_file_xsgetn (_IO_FILE *, void *, _IO_size_t);
+libc_hidden_proto (_IO_file_xsgetn)
extern int _IO_file_stat (_IO_FILE *, void *) __THROW;
+libc_hidden_proto (_IO_file_stat)
extern int _IO_file_close (_IO_FILE *) __THROW;
+libc_hidden_proto (_IO_file_close)
extern int _IO_file_close_mmap (_IO_FILE *) __THROW;
extern int _IO_file_underflow (_IO_FILE *);
+libc_hidden_proto (_IO_file_underflow)
extern int _IO_file_underflow_mmap (_IO_FILE *);
extern int _IO_file_underflow_maybe_mmap (_IO_FILE *);
extern int _IO_file_overflow (_IO_FILE *, int);
+libc_hidden_proto (_IO_file_overflow)
#define _IO_file_is_open(__fp) ((__fp)->_fileno != -1)
extern void _IO_file_init (struct _IO_FILE_plus *) __THROW;
+libc_hidden_proto (_IO_file_init)
extern _IO_FILE* _IO_file_attach (_IO_FILE *, int);
+libc_hidden_proto (_IO_file_attach)
extern _IO_FILE* _IO_file_open (_IO_FILE *, const char *, int, int, int, int);
libc_hidden_proto (_IO_file_open)
extern _IO_FILE* _IO_file_fopen (_IO_FILE *, const char *, const char *, int);
+libc_hidden_proto (_IO_file_fopen)
extern _IO_ssize_t _IO_file_write (_IO_FILE *, const void *, _IO_ssize_t);
extern _IO_ssize_t _IO_file_read (_IO_FILE *, void *, _IO_ssize_t);
+libc_hidden_proto (_IO_file_read)
extern int _IO_file_sync (_IO_FILE *);
+libc_hidden_proto (_IO_file_sync)
extern int _IO_file_close_it (_IO_FILE *);
+libc_hidden_proto (_IO_file_close_it)
extern _IO_off64_t _IO_file_seek (_IO_FILE *, _IO_off64_t, int) __THROW;
+libc_hidden_proto (_IO_file_seek)
extern void _IO_file_finish (_IO_FILE *, int);
+libc_hidden_proto (_IO_file_finish)
extern _IO_FILE* _IO_new_file_attach (_IO_FILE *, int);
extern int _IO_new_file_close_it (_IO_FILE *);
@@ -591,11 +632,16 @@ extern void _IO_old_file_finish (_IO_FILE *, int);
extern int _IO_wfile_doallocate (_IO_FILE *) __THROW;
extern _IO_size_t _IO_wfile_xsputn (_IO_FILE *, const void *, _IO_size_t);
+libc_hidden_proto (_IO_wfile_xsputn)
extern _IO_FILE* _IO_wfile_setbuf (_IO_FILE *, wchar_t *, _IO_ssize_t);
extern wint_t _IO_wfile_sync (_IO_FILE *);
+libc_hidden_proto (_IO_wfile_sync)
extern wint_t _IO_wfile_underflow (_IO_FILE *);
+libc_hidden_proto (_IO_wfile_underflow)
extern wint_t _IO_wfile_overflow (_IO_FILE *, wint_t);
+libc_hidden_proto (_IO_wfile_overflow)
extern _IO_off64_t _IO_wfile_seekoff (_IO_FILE *, _IO_off64_t, int, int);
+libc_hidden_proto (_IO_wfile_seekoff)
/* Jumptable functions for proc_files. */
extern _IO_FILE* _IO_proc_open (_IO_FILE *, const char *, const char *)
@@ -609,9 +655,13 @@ extern int _IO_old_proc_close (_IO_FILE *);
/* Jumptable functions for strfiles. */
extern int _IO_str_underflow (_IO_FILE *) __THROW;
+libc_hidden_proto (_IO_str_underflow)
extern int _IO_str_overflow (_IO_FILE *, int) __THROW;
+libc_hidden_proto (_IO_str_overflow)
extern int _IO_str_pbackfail (_IO_FILE *, int) __THROW;
+libc_hidden_proto (_IO_str_pbackfail)
extern _IO_off64_t _IO_str_seekoff (_IO_FILE *, _IO_off64_t, int, int) __THROW;
+libc_hidden_proto (_IO_str_seekoff)
extern void _IO_str_finish (_IO_FILE *, int) __THROW;
/* Other strfile functions */
@@ -641,115 +691,25 @@ extern int _IO_vsnprintf (char *string, _IO_size_t maxlen,
extern _IO_size_t _IO_getline (_IO_FILE *,char *, _IO_size_t, int, int);
+libc_hidden_proto (_IO_getline)
extern _IO_size_t _IO_getline_info (_IO_FILE *,char *, _IO_size_t,
int, int, int *);
+libc_hidden_proto (_IO_getline_info)
extern _IO_ssize_t _IO_getdelim (char **, _IO_size_t *, int, _IO_FILE *);
extern _IO_size_t _IO_getwline (_IO_FILE *,wchar_t *, _IO_size_t, wint_t, int);
extern _IO_size_t _IO_getwline_info (_IO_FILE *,wchar_t *, _IO_size_t,
wint_t, int, wint_t *);
extern struct _IO_FILE_plus *_IO_list_all;
+libc_hidden_proto (_IO_list_all)
extern void (*_IO_cleanup_registration_needed) (void);
-/* Prototype for functions with alternative entry point. */
-extern int _IO_flush_all_internal (void);
-extern unsigned _IO_adjust_column_internal (unsigned, const char *, int);
-
-extern int _IO_default_uflow_internal (_IO_FILE *);
-extern void _IO_default_finish_internal (_IO_FILE *, int) __THROW;
-extern int _IO_default_pbackfail_internal (_IO_FILE *, int) __THROW;
-extern _IO_size_t _IO_default_xsputn_internal (_IO_FILE *, const void *,
- _IO_size_t);
-extern _IO_size_t _IO_default_xsgetn_internal (_IO_FILE *, void *, _IO_size_t);
-extern int _IO_default_doallocate_internal (_IO_FILE *) __THROW;
-extern void _IO_wdefault_finish_internal (_IO_FILE *, int) __THROW;
-extern wint_t _IO_wdefault_pbackfail_internal (_IO_FILE *, wint_t) __THROW;
-extern _IO_size_t _IO_wdefault_xsputn_internal (_IO_FILE *, const void *,
- _IO_size_t);
-extern _IO_size_t _IO_wdefault_xsgetn_internal (_IO_FILE *, void *,
- _IO_size_t);
-extern int _IO_wdefault_doallocate_internal (_IO_FILE *) __THROW;
-extern wint_t _IO_wdefault_uflow_internal (_IO_FILE *);
-
-extern int _IO_file_doallocate_internal (_IO_FILE *) __THROW;
-extern _IO_FILE* _IO_file_setbuf_internal (_IO_FILE *, char *, _IO_ssize_t);
-extern _IO_off64_t _IO_file_seekoff_internal (_IO_FILE *, _IO_off64_t,
- int, int);
-extern _IO_size_t _IO_file_xsputn_internal (_IO_FILE *, const void *,
- _IO_size_t);
-extern _IO_size_t _IO_file_xsgetn_internal (_IO_FILE *, void *, _IO_size_t);
-extern int _IO_file_stat_internal (_IO_FILE *, void *) __THROW;
-extern int _IO_file_close_internal (_IO_FILE *) __THROW;
-extern int _IO_file_close_it_internal (_IO_FILE *);
-extern int _IO_file_underflow_internal (_IO_FILE *);
-extern int _IO_file_overflow_internal (_IO_FILE *, int);
-extern void _IO_file_init_internal (struct _IO_FILE_plus *) __THROW;
-extern _IO_FILE* _IO_file_attach_internal (_IO_FILE *, int);
-extern _IO_FILE* _IO_file_fopen_internal (_IO_FILE *, const char *,
- const char *, int);
-extern _IO_ssize_t _IO_file_read_internal (_IO_FILE *, void *,
- _IO_ssize_t);
-extern int _IO_file_sync_internal (_IO_FILE *);
-extern _IO_off64_t _IO_file_seek_internal (_IO_FILE *, _IO_off64_t, int)
- __THROW;
-extern void _IO_file_finish_internal (_IO_FILE *, int);
-
-extern _IO_size_t _IO_wfile_xsputn_internal (_IO_FILE *, const void *,
- _IO_size_t);
-extern _IO_off64_t _IO_wfile_seekoff_internal (_IO_FILE *, _IO_off64_t,
- int, int);
-extern wint_t _IO_wfile_sync_internal (_IO_FILE *);
-
-extern int _IO_str_underflow_internal (_IO_FILE *) __THROW;
-extern int _IO_str_overflow_internal (_IO_FILE *, int) __THROW;
-extern int _IO_str_pbackfail_internal (_IO_FILE *, int) __THROW;
-extern _IO_off64_t _IO_str_seekoff_internal (_IO_FILE *, _IO_off64_t,
- int, int) __THROW;
extern void _IO_str_init_static_internal (struct _IO_strfile_ *, char *,
_IO_size_t, char *) __THROW;
-
-extern struct _IO_jump_t _IO_file_jumps_internal attribute_hidden;
-extern struct _IO_jump_t _IO_wfile_jumps_internal attribute_hidden;
-
-extern struct _IO_FILE_plus *_IO_list_all_internal attribute_hidden;
-
-extern void _IO_link_in_internal (struct _IO_FILE_plus *) __THROW;
-extern int _IO_sputbackc_internal (_IO_FILE *, int) __THROW;
-extern void _IO_wdoallocbuf_internal (_IO_FILE *) __THROW;
-
-extern _IO_size_t _IO_sgetn_internal (_IO_FILE *, void *, _IO_size_t);
-extern void _IO_flush_all_linebuffered_internal (void) __THROW;
-extern int _IO_switch_to_wget_mode_internal (_IO_FILE *);
-extern void _IO_unsave_markers_internal (_IO_FILE *) __THROW;
-extern void _IO_switch_to_main_wget_area_internal (_IO_FILE *) __THROW;
-extern int _IO_wdo_write_internal (_IO_FILE *, const wchar_t *, _IO_size_t);
-extern int _IO_do_write_internal (_IO_FILE *, const char *, _IO_size_t);
-extern _IO_ssize_t _IO_padn_internal (_IO_FILE *, int, _IO_ssize_t);
-extern _IO_size_t _IO_getline_info_internal (_IO_FILE *,char *, _IO_size_t,
- int, int, int *);
-extern _IO_size_t _IO_getline_internal (_IO_FILE *, char *, _IO_size_t, int,
- int);
-extern void _IO_free_wbackup_area_internal (_IO_FILE *) __THROW;
-extern void _IO_free_backup_area_internal (_IO_FILE *) __THROW;
-extern void _IO_switch_to_wbackup_area_internal (_IO_FILE *) __THROW;
-extern void _IO_setb_internal (_IO_FILE *, char *, char *, int) __THROW;
-extern wint_t _IO_sputbackwc_internal (_IO_FILE *, wint_t) __THROW;
-extern int _IO_switch_to_get_mode_internal (_IO_FILE *);
-extern int _IO_vfscanf_internal (_IO_FILE * __restrict,
- const char * __restrict,
- _IO_va_list, int *__restrict);
-extern int _IO_vfprintf_internal (_IO_FILE *__restrict, const char *__restrict,
- _IO_va_list);
-extern void _IO_doallocbuf_internal (_IO_FILE *) __THROW;
-extern void _IO_wsetb_internal (_IO_FILE *, wchar_t *, wchar_t *, int)
- __THROW;
extern _IO_off64_t _IO_seekoff_unlocked (_IO_FILE *, _IO_off64_t, int, int)
attribute_hidden;
extern _IO_off64_t _IO_seekpos_unlocked (_IO_FILE *, _IO_off64_t, int)
attribute_hidden;
-extern int _IO_putc_internal (int __c, _IO_FILE *__fp);
-extern void _IO_init_internal (_IO_FILE *, int) __THROW;
-extern void _IO_un_link_internal (struct _IO_FILE_plus *) __THROW;
#ifndef EOF
# define EOF (-1)
diff --git a/libio/memstream.c b/libio/memstream.c
index bbdc5ba..37bbbfc 100644
--- a/libio/memstream.c
+++ b/libio/memstream.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-97,99,2000,2002-2004,2006 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2012 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
@@ -37,17 +37,17 @@ static const struct _IO_jump_t _IO_mem_jumps =
{
JUMP_INIT_DUMMY,
JUMP_INIT (finish, _IO_mem_finish),
- JUMP_INIT (overflow, INTUSE(_IO_str_overflow)),
- JUMP_INIT (underflow, INTUSE(_IO_str_underflow)),
- JUMP_INIT (uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT (pbackfail, INTUSE(_IO_str_pbackfail)),
- JUMP_INIT (xsputn, INTUSE(_IO_default_xsputn)),
- JUMP_INIT (xsgetn, INTUSE(_IO_default_xsgetn)),
- JUMP_INIT (seekoff, INTUSE(_IO_str_seekoff)),
+ JUMP_INIT (overflow, _IO_str_overflow),
+ JUMP_INIT (underflow, _IO_str_underflow),
+ JUMP_INIT (uflow, _IO_default_uflow),
+ JUMP_INIT (pbackfail, _IO_str_pbackfail),
+ JUMP_INIT (xsputn, _IO_default_xsputn),
+ JUMP_INIT (xsgetn, _IO_default_xsgetn),
+ JUMP_INIT (seekoff, _IO_str_seekoff),
JUMP_INIT (seekpos, _IO_default_seekpos),
JUMP_INIT (setbuf, _IO_default_setbuf),
JUMP_INIT (sync, _IO_mem_sync),
- JUMP_INIT (doallocate, INTUSE(_IO_default_doallocate)),
+ JUMP_INIT (doallocate, _IO_default_doallocate),
JUMP_INIT (read, _IO_default_read),
JUMP_INIT (write, _IO_default_write),
JUMP_INIT (seek, _IO_default_seek),
@@ -85,7 +85,7 @@ open_memstream (bufloc, sizeloc)
buf = calloc (1, _IO_BUFSIZ);
if (buf == NULL)
return NULL;
- INTUSE(_IO_init) (&new_f->fp._sf._sbf._f, 0);
+ _IO_init (&new_f->fp._sf._sbf._f, 0);
_IO_JUMPS ((struct _IO_FILE_plus *) &new_f->fp._sf._sbf) = &_IO_mem_jumps;
_IO_str_init_static_internal (&new_f->fp._sf, buf, _IO_BUFSIZ, buf);
new_f->fp._sf._sbf._f._flags &= ~_IO_USER_BUF;
@@ -108,7 +108,7 @@ _IO_mem_sync (fp)
if (fp->_IO_write_ptr == fp->_IO_write_end)
{
- INTUSE(_IO_str_overflow) (fp, '\0');
+ _IO_str_overflow (fp, '\0');
--fp->_IO_write_ptr;
}
else
diff --git a/libio/obprintf.c b/libio/obprintf.c
index f2f93b2..ef2cfc3 100644
--- a/libio/obprintf.c
+++ b/libio/obprintf.c
@@ -1,6 +1,5 @@
/* Print output of stream to given obstack.
- Copyright (C) 1996,1997,1999,2000,2001,2002,2003,2004,2005,2006,2008,2012
- Free Software Foundation, Inc.
+ Copyright (C) 1996-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -165,7 +164,7 @@ _IO_obstack_vprintf (struct obstack *obstack, const char *format, va_list args)
new_f.ofile.obstack = obstack;
- result = INTUSE(_IO_vfprintf) (&new_f.ofile.file.file, format, args);
+ result = _IO_vfprintf (&new_f.ofile.file.file, format, args);
/* Shrink the buffer to the space we really currently need. */
obstack_blank_fast (obstack, (new_f.ofile.file.file._IO_write_ptr
diff --git a/libio/oldfileops.c b/libio/oldfileops.c
index 6e25b5e..c68ca6a 100644
--- a/libio/oldfileops.c
+++ b/libio/oldfileops.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997-2004, 2005, 2007, 2011-2012
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Per Bothner <bothner@cygnus.com>.
@@ -123,7 +122,7 @@ _IO_old_file_init (fp)
fp->file._old_offset = _IO_pos_BAD;
fp->file._IO_file_flags |= CLOSED_FILEBUF_FLAGS;
- INTUSE(_IO_link_in) (fp);
+ _IO_link_in (fp);
fp->file._vtable_offset = ((int) sizeof (struct _IO_FILE)
- (int) sizeof (struct _IO_FILE_complete));
fp->file._fileno = -1;
@@ -150,17 +149,17 @@ _IO_old_file_close_it (fp)
write_status = _IO_old_do_flush (fp);
- INTUSE(_IO_unsave_markers) (fp);
+ _IO_unsave_markers (fp);
close_status = ((fp->_flags2 & _IO_FLAGS2_NOCLOSE) == 0
? _IO_SYSCLOSE (fp) : 0);
/* Free buffer. */
- INTUSE(_IO_setb) (fp, NULL, NULL, 0);
+ _IO_setb (fp, NULL, NULL, 0);
_IO_setg (fp, NULL, NULL, NULL);
_IO_setp (fp, NULL, NULL);
- INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) fp);
+ _IO_un_link ((struct _IO_FILE_plus *) fp);
fp->_flags = _IO_MAGIC|CLOSED_FILEBUF_FLAGS;
fp->_fileno = -1;
fp->_old_offset = _IO_pos_BAD;
@@ -180,7 +179,7 @@ _IO_old_file_finish (fp, dummy)
if (!(fp->_flags & _IO_DELETE_DONT_CLOSE))
_IO_SYSCLOSE (fp);
}
- INTUSE(_IO_default_finish) (fp, 0);
+ _IO_default_finish (fp, 0);
}
_IO_FILE *
@@ -229,7 +228,7 @@ _IO_old_file_fopen (fp, filename, mode)
if (_IO_SEEKOFF (fp, (_IO_off_t)0, _IO_seek_end, _IOS_INPUT|_IOS_OUTPUT)
== _IO_pos_BAD && errno != ESPIPE)
return NULL;
- INTUSE(_IO_link_in) ((struct _IO_FILE_plus *) fp);
+ _IO_link_in ((struct _IO_FILE_plus *) fp);
return fp;
}
@@ -311,8 +310,7 @@ old_do_write (fp, data, to_do)
}
count = _IO_SYSWRITE (fp, data, to_do);
if (fp->_cur_column && count)
- fp->_cur_column = INTUSE(_IO_adjust_column) (fp->_cur_column - 1, data,
- count) + 1;
+ fp->_cur_column = _IO_adjust_column (fp->_cur_column - 1, data, count) + 1;
_IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base);
fp->_IO_write_base = fp->_IO_write_ptr = fp->_IO_buf_base;
fp->_IO_write_end = ((fp->_flags & (_IO_LINE_BUF+_IO_UNBUFFERED))
@@ -349,15 +347,15 @@ _IO_old_file_underflow (fp)
free (fp->_IO_save_base);
fp->_flags &= ~_IO_IN_BACKUP;
}
- INTUSE(_IO_doallocbuf) (fp);
+ _IO_doallocbuf (fp);
}
/* Flush all line buffered files before reading. */
/* FIXME This can/should be moved to genops ?? */
if (fp->_flags & (_IO_LINE_BUF|_IO_UNBUFFERED))
- INTUSE(_IO_flush_all_linebuffered) ();
+ _IO_flush_all_linebuffered ();
- INTUSE(_IO_switch_to_get_mode) (fp);
+ _IO_switch_to_get_mode (fp);
/* This is very tricky. We have to adjust those
pointers before we call _IO_SYSREAD () since
@@ -403,7 +401,7 @@ _IO_old_file_overflow (f, ch)
/* Allocate a buffer if needed. */
if (f->_IO_write_base == 0)
{
- INTUSE(_IO_doallocbuf) (f);
+ _IO_doallocbuf (f);
_IO_setg (f, f->_IO_buf_base, f->_IO_buf_base, f->_IO_buf_base);
}
/* Otherwise must be currently reading.
@@ -500,7 +498,7 @@ _IO_old_file_seekoff (fp, offset, dir, mode)
FIXME: simulate mem-papped files. */
if (fp->_IO_write_ptr > fp->_IO_write_base || _IO_in_put_mode (fp))
- if (INTUSE(_IO_switch_to_get_mode) (fp))
+ if (_IO_switch_to_get_mode (fp))
return EOF;
if (fp->_IO_buf_base == NULL)
@@ -511,7 +509,7 @@ _IO_old_file_seekoff (fp, offset, dir, mode)
free (fp->_IO_read_base);
fp->_flags &= ~_IO_IN_BACKUP;
}
- INTUSE(_IO_doallocbuf) (fp);
+ _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);
}
@@ -597,7 +595,7 @@ _IO_old_file_seekoff (fp, offset, dir, mode)
}
#ifdef TODO
- INTUSE(_IO_unsave_markers) (fp);
+ _IO_unsave_markers (fp);
#endif
if (fp->_flags & _IO_NO_READS)
@@ -637,7 +635,7 @@ _IO_old_file_seekoff (fp, offset, dir, mode)
return offset;
dumb:
- INTUSE(_IO_unsave_markers) (fp);
+ _IO_unsave_markers (fp);
result = _IO_SYSSEEK (fp, offset, dir);
if (result != EOF)
{
@@ -772,7 +770,7 @@ _IO_old_file_xsputn (f, data, n)
buffer, but it's somewhat messier for line-buffered files,
so we let _IO_default_xsputn handle the general case. */
if (to_do)
- to_do -= INTUSE(_IO_default_xsputn) (f, s+do_write, to_do);
+ to_do -= _IO_default_xsputn (f, s+do_write, to_do);
}
return n - to_do;
}
@@ -784,20 +782,20 @@ const struct _IO_jump_t _IO_old_file_jumps =
JUMP_INIT(finish, _IO_old_file_finish),
JUMP_INIT(overflow, _IO_old_file_overflow),
JUMP_INIT(underflow, _IO_old_file_underflow),
- JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT(pbackfail, INTUSE(_IO_default_pbackfail)),
+ JUMP_INIT(uflow, _IO_default_uflow),
+ JUMP_INIT(pbackfail, _IO_default_pbackfail),
JUMP_INIT(xsputn, _IO_old_file_xsputn),
- JUMP_INIT(xsgetn, INTUSE(_IO_default_xsgetn)),
+ JUMP_INIT(xsgetn, _IO_default_xsgetn),
JUMP_INIT(seekoff, _IO_old_file_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, _IO_old_file_setbuf),
JUMP_INIT(sync, _IO_old_file_sync),
- JUMP_INIT(doallocate, INTUSE(_IO_file_doallocate)),
- JUMP_INIT(read, INTUSE(_IO_file_read)),
+ JUMP_INIT(doallocate, _IO_file_doallocate),
+ JUMP_INIT(read, _IO_file_read),
JUMP_INIT(write, _IO_old_file_write),
- JUMP_INIT(seek, INTUSE(_IO_file_seek)),
- JUMP_INIT(close, INTUSE(_IO_file_close)),
- JUMP_INIT(stat, INTUSE(_IO_file_stat))
+ JUMP_INIT(seek, _IO_file_seek),
+ JUMP_INIT(close, _IO_file_close),
+ JUMP_INIT(stat, _IO_file_stat)
};
compat_symbol (libc, _IO_old_do_write, _IO_do_write, GLIBC_2_0);
diff --git a/libio/oldiofclose.c b/libio/oldiofclose.c
index 1ce2cd4..ff2e1d9 100644
--- a/libio/oldiofclose.c
+++ b/libio/oldiofclose.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993,1995,1997-2002,2004,2005,2012
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -49,7 +48,7 @@ _IO_old_fclose (fp)
/* First unlink the stream. */
if (fp->_IO_file_flags & _IO_IS_FILEBUF)
- INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) fp);
+ _IO_un_link ((struct _IO_FILE_plus *) fp);
_IO_acquire_lock (fp);
if (fp->_IO_file_flags & _IO_IS_FILEBUF)
@@ -59,7 +58,7 @@ _IO_old_fclose (fp)
_IO_release_lock (fp);
_IO_FINISH (fp);
if (_IO_have_backup (fp))
- INTUSE(_IO_free_backup_area) (fp);
+ _IO_free_backup_area (fp);
if (fp != _IO_stdin && fp != _IO_stdout && fp != _IO_stderr)
{
fp->_IO_file_flags = 0;
diff --git a/libio/oldiofdopen.c b/libio/oldiofdopen.c
index 50fcf33..d692e30 100644
--- a/libio/oldiofdopen.c
+++ b/libio/oldiofdopen.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993,94,97,99,2000,2002,2003,2004,2012
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -121,7 +120,7 @@ _IO_old_fdopen (fd, mode)
#endif
if (_IO_old_file_attach (&new_f->fp.file._file, fd) == NULL)
{
- INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) &new_f->fp);
+ _IO_un_link ((struct _IO_FILE_plus *) &new_f->fp);
free (new_f);
return NULL;
}
diff --git a/libio/oldiofopen.c b/libio/oldiofopen.c
index 417bc2c..716b5cd 100644
--- a/libio/oldiofopen.c
+++ b/libio/oldiofopen.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993,1997,1999,2000,2002,2003,2004,2012
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -60,7 +59,7 @@ _IO_old_fopen (filename, mode)
#endif
if (_IO_old_file_fopen ((_IO_FILE *) &new_f->fp, filename, mode) != NULL)
return (_IO_FILE *) &new_f->fp;
- INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) &new_f->fp);
+ _IO_un_link ((struct _IO_FILE_plus *) &new_f->fp);
free (new_f);
return NULL;
}
diff --git a/libio/oldiopopen.c b/libio/oldiopopen.c
index 5d808cb..e14961a 100644
--- a/libio/oldiopopen.c
+++ b/libio/oldiopopen.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998-2002, 2004, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 1998-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Per Bothner <bothner@cygnus.com>.
@@ -229,7 +229,7 @@ _IO_old_popen (command, mode)
#endif
if (_IO_old_proc_open (fp, command, mode) != NULL)
return fp;
- INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) &new_f->fpx.file);
+ _IO_un_link ((struct _IO_FILE_plus *) &new_f->fpx.file);
free (new_f);
return NULL;
}
@@ -289,20 +289,20 @@ const struct _IO_jump_t _IO_old_proc_jumps = {
JUMP_INIT(finish, _IO_old_file_finish),
JUMP_INIT(overflow, _IO_old_file_overflow),
JUMP_INIT(underflow, _IO_old_file_underflow),
- JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT(pbackfail, INTUSE(_IO_default_pbackfail)),
+ JUMP_INIT(uflow, _IO_default_uflow),
+ JUMP_INIT(pbackfail, _IO_default_pbackfail),
JUMP_INIT(xsputn, _IO_old_file_xsputn),
- JUMP_INIT(xsgetn, INTUSE(_IO_default_xsgetn)),
+ JUMP_INIT(xsgetn, _IO_default_xsgetn),
JUMP_INIT(seekoff, _IO_old_file_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, _IO_old_file_setbuf),
JUMP_INIT(sync, _IO_old_file_sync),
- JUMP_INIT(doallocate, INTUSE(_IO_file_doallocate)),
- JUMP_INIT(read, INTUSE(_IO_file_read)),
+ JUMP_INIT(doallocate, _IO_file_doallocate),
+ JUMP_INIT(read, _IO_file_read),
JUMP_INIT(write, _IO_old_file_write),
- JUMP_INIT(seek, INTUSE(_IO_file_seek)),
+ JUMP_INIT(seek, _IO_file_seek),
JUMP_INIT(close, _IO_old_proc_close),
- JUMP_INIT(stat, INTUSE(_IO_file_stat)),
+ JUMP_INIT(stat, _IO_file_stat),
JUMP_INIT(showmanyc, _IO_default_showmanyc),
JUMP_INIT(imbue, _IO_default_imbue)
};
diff --git a/libio/oldstdfiles.c b/libio/oldstdfiles.c
index a2d77d1..5a67d73 100644
--- a/libio/oldstdfiles.c
+++ b/libio/oldstdfiles.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,94,96,97,99,2000,2002,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -81,7 +81,7 @@ _IO_check_libio ()
_IO_stdin = stdin = (_IO_FILE *) &_IO_stdin_;
_IO_stdout = stdout = (_IO_FILE *) &_IO_stdout_;
_IO_stderr = stderr = (_IO_FILE *) &_IO_stderr_;
- INTUSE(_IO_list_all) = &_IO_stderr_;
+ _IO_list_all = &_IO_stderr_;
_IO_stdin->_vtable_offset = _IO_stdout->_vtable_offset =
_IO_stderr->_vtable_offset = stdin->_vtable_offset =
stdout->_vtable_offset = stderr->_vtable_offset =
diff --git a/libio/putc.c b/libio/putc.c
index bb4624f..4d97b50 100644
--- a/libio/putc.c
+++ b/libio/putc.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 1998, 2002, 2003
- Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -33,7 +32,7 @@ _IO_putc (c, fp)
_IO_release_lock (fp);
return result;
}
-INTDEF(_IO_putc)
+libc_hidden_def (_IO_putc)
#undef putc
diff --git a/libio/setbuf.c b/libio/setbuf.c
index 1868578..a20ef1f 100644
--- a/libio/setbuf.c
+++ b/libio/setbuf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -32,5 +32,5 @@ setbuf (fp, buf)
_IO_FILE *fp;
char *buf;
{
- INTUSE(_IO_setbuffer) (fp, buf, _IO_BUFSIZ);
+ _IO_setbuffer (fp, buf, _IO_BUFSIZ);
}
diff --git a/libio/setlinebuf.c b/libio/setlinebuf.c
index 65f7fdc..e0db23c 100644
--- a/libio/setlinebuf.c
+++ b/libio/setlinebuf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1997, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -33,5 +33,5 @@ void
setlinebuf (stream)
_IO_FILE *stream;
{
- INTUSE(_IO_setvbuf) (stream, NULL, 1, 0);
+ _IO_setvbuf (stream, NULL, 1, 0);
}
diff --git a/libio/stdfiles.c b/libio/stdfiles.c
index 752164b..1acef3f 100644
--- a/libio/stdfiles.c
+++ b/libio/stdfiles.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993-1997,1999,2000,2002,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -70,4 +70,4 @@ DEF_STDFILE(_IO_2_1_stdout_, 1, &_IO_2_1_stdin_, _IO_NO_READS);
DEF_STDFILE(_IO_2_1_stderr_, 2, &_IO_2_1_stdout_, _IO_NO_READS+_IO_UNBUFFERED);
struct _IO_FILE_plus *_IO_list_all = &_IO_2_1_stderr_;
-INTVARDEF(_IO_list_all)
+libc_hidden_data_def (_IO_list_all)
diff --git a/libio/strops.c b/libio/strops.c
index 9dbf322..ccbfc99 100644
--- a/libio/strops.c
+++ b/libio/strops.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1997-2003, 2004, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -46,7 +46,7 @@ _IO_str_init_static_internal (sf, ptr, size, pstart)
end = ptr + size;
else
end = (char *) -1;
- INTUSE(_IO_setb) (fp, ptr, end, 0);
+ _IO_setb (fp, ptr, end, 0);
fp->_IO_write_base = ptr;
fp->_IO_read_base = ptr;
@@ -131,7 +131,7 @@ _IO_str_overflow (fp, c)
}
memset (new_buf + old_blen, '\0', new_size - old_blen);
- INTUSE(_IO_setb) (fp, new_buf, new_buf + new_size, 1);
+ _IO_setb (fp, new_buf, new_buf + new_size, 1);
fp->_IO_read_base = new_buf + (fp->_IO_read_base - old_buf);
fp->_IO_read_ptr = new_buf + (fp->_IO_read_ptr - old_buf);
fp->_IO_read_end = new_buf + (fp->_IO_read_end - old_buf);
@@ -148,7 +148,7 @@ _IO_str_overflow (fp, c)
fp->_IO_read_end = fp->_IO_write_ptr;
return c;
}
-INTDEF(_IO_str_overflow)
+libc_hidden_def (_IO_str_overflow)
int
_IO_str_underflow (fp)
@@ -167,7 +167,7 @@ _IO_str_underflow (fp)
else
return EOF;
}
-INTDEF(_IO_str_underflow)
+libc_hidden_def (_IO_str_underflow)
/* The size of the valid part of the buffer. */
@@ -210,7 +210,7 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading)
fp->_IO_buf_base = NULL;
}
- INTUSE(_IO_setb) (fp, newbuf, newbuf + newsize, 1);
+ _IO_setb (fp, newbuf, newbuf + newsize, 1);
if (reading)
{
@@ -320,7 +320,7 @@ _IO_str_seekoff (fp, offset, dir, mode)
}
return new_pos;
}
-INTDEF(_IO_str_seekoff)
+libc_hidden_def (_IO_str_seekoff)
int
_IO_str_pbackfail (fp, c)
@@ -329,9 +329,9 @@ _IO_str_pbackfail (fp, c)
{
if ((fp->_flags & _IO_NO_WRITES) && c != EOF)
return EOF;
- return INTUSE(_IO_default_pbackfail) (fp, c);
+ return _IO_default_pbackfail (fp, c);
}
-INTDEF(_IO_str_pbackfail)
+libc_hidden_def (_IO_str_pbackfail)
void
_IO_str_finish (fp, dummy)
@@ -342,24 +342,24 @@ _IO_str_finish (fp, dummy)
(((_IO_strfile *) fp)->_s._free_buffer) (fp->_IO_buf_base);
fp->_IO_buf_base = NULL;
- INTUSE(_IO_default_finish) (fp, 0);
+ _IO_default_finish (fp, 0);
}
const struct _IO_jump_t _IO_str_jumps =
{
JUMP_INIT_DUMMY,
JUMP_INIT(finish, _IO_str_finish),
- JUMP_INIT(overflow, INTUSE(_IO_str_overflow)),
- JUMP_INIT(underflow, INTUSE(_IO_str_underflow)),
- JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT(pbackfail, INTUSE(_IO_str_pbackfail)),
- JUMP_INIT(xsputn, INTUSE(_IO_default_xsputn)),
- JUMP_INIT(xsgetn, INTUSE(_IO_default_xsgetn)),
- JUMP_INIT(seekoff, INTUSE(_IO_str_seekoff)),
+ JUMP_INIT(overflow, _IO_str_overflow),
+ JUMP_INIT(underflow, _IO_str_underflow),
+ JUMP_INIT(uflow, _IO_default_uflow),
+ JUMP_INIT(pbackfail, _IO_str_pbackfail),
+ JUMP_INIT(xsputn, _IO_default_xsputn),
+ JUMP_INIT(xsgetn, _IO_default_xsgetn),
+ JUMP_INIT(seekoff, _IO_str_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, _IO_default_setbuf),
JUMP_INIT(sync, _IO_default_sync),
- JUMP_INIT(doallocate, INTUSE(_IO_default_doallocate)),
+ JUMP_INIT(doallocate, _IO_default_doallocate),
JUMP_INIT(read, _IO_default_read),
JUMP_INIT(write, _IO_default_write),
JUMP_INIT(seek, _IO_default_seek),
diff --git a/libio/vasprintf.c b/libio/vasprintf.c
index 8f74380..494efa6 100644
--- a/libio/vasprintf.c
+++ b/libio/vasprintf.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1995,1997,1999-2002,2004,2006,2009
- Free Software Foundation, Inc.
+/* Copyright (C) 1995-2012 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
@@ -60,7 +59,7 @@ _IO_vasprintf (result_ptr, format, args)
sf._sbf._f._flags &= ~_IO_USER_BUF;
sf._s._allocate_buffer = (_IO_alloc_type) malloc;
sf._s._free_buffer = (_IO_free_type) free;
- ret = INTUSE(_IO_vfprintf) (&sf._sbf._f, format, args);
+ ret = _IO_vfprintf (&sf._sbf._f, format, args);
if (ret < 0)
{
free (sf._sbf._f._IO_buf_base);
diff --git a/libio/vscanf.c b/libio/vscanf.c
index 895109d..12bfb34 100644
--- a/libio/vscanf.c
+++ b/libio/vscanf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1997, 2002, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -34,6 +34,6 @@ _IO_vscanf (format, args)
const char *format;
_IO_va_list args;
{
- return INTUSE(_IO_vfscanf) (_IO_stdin, format, args, NULL);
+ return _IO_vfscanf (_IO_stdin, format, args, NULL);
}
ldbl_weak_alias (_IO_vscanf, vscanf)
diff --git a/libio/vsnprintf.c b/libio/vsnprintf.c
index 8d6edfa..e0402d3 100644
--- a/libio/vsnprintf.c
+++ b/libio/vsnprintf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994,1997,1999-2004,2006,2009 Free Software Foundation, Inc.
+/* Copyright (C) 1994-2012 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
@@ -48,8 +48,8 @@ _IO_strn_overflow (fp, c)
a size to make this possible. */
*fp->_IO_write_ptr = '\0';
- INTUSE(_IO_setb) (fp, snf->overflow_buf,
- snf->overflow_buf + sizeof (snf->overflow_buf), 0);
+ _IO_setb (fp, snf->overflow_buf,
+ snf->overflow_buf + sizeof (snf->overflow_buf), 0);
fp->_IO_write_base = snf->overflow_buf;
fp->_IO_read_base = snf->overflow_buf;
@@ -71,16 +71,16 @@ const struct _IO_jump_t _IO_strn_jumps attribute_hidden =
JUMP_INIT_DUMMY,
JUMP_INIT(finish, _IO_str_finish),
JUMP_INIT(overflow, _IO_strn_overflow),
- JUMP_INIT(underflow, INTUSE(_IO_str_underflow)),
- JUMP_INIT(uflow, INTUSE(_IO_default_uflow)),
- JUMP_INIT(pbackfail, INTUSE(_IO_str_pbackfail)),
- JUMP_INIT(xsputn, INTUSE(_IO_default_xsputn)),
- JUMP_INIT(xsgetn, INTUSE(_IO_default_xsgetn)),
- JUMP_INIT(seekoff, INTUSE(_IO_str_seekoff)),
+ JUMP_INIT(underflow, _IO_str_underflow),
+ JUMP_INIT(uflow, _IO_default_uflow),
+ JUMP_INIT(pbackfail, _IO_str_pbackfail),
+ JUMP_INIT(xsputn, _IO_default_xsputn),
+ JUMP_INIT(xsgetn, _IO_default_xsgetn),
+ JUMP_INIT(seekoff, _IO_str_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, _IO_default_setbuf),
JUMP_INIT(sync, _IO_default_sync),
- JUMP_INIT(doallocate, INTUSE(_IO_default_doallocate)),
+ JUMP_INIT(doallocate, _IO_default_doallocate),
JUMP_INIT(read, _IO_default_read),
JUMP_INIT(write, _IO_default_write),
JUMP_INIT(seek, _IO_default_seek),
@@ -116,7 +116,7 @@ _IO_vsnprintf (string, maxlen, format, args)
_IO_JUMPS (&sf.f._sbf) = &_IO_strn_jumps;
string[0] = '\0';
_IO_str_init_static_internal (&sf.f, string, maxlen - 1, string);
- ret = INTUSE(_IO_vfprintf) (&sf.f._sbf._f, format, args);
+ ret = _IO_vfprintf (&sf.f._sbf._f, format, args);
if (sf.f._sbf._f._IO_buf_base != sf.overflow_buf)
*sf.f._sbf._f._IO_write_ptr = '\0';
diff --git a/libio/vswprintf.c b/libio/vswprintf.c
index c61dcc6..4003e26 100644
--- a/libio/vswprintf.c
+++ b/libio/vswprintf.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1994, 1997, 1999-2002, 2004, 2005, 2006
- Free Software Foundation, Inc.
+/* Copyright (C) 1994-2012 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
@@ -45,9 +44,9 @@ _IO_wstrn_overflow (fp, c)
if (fp->_wide_data->_IO_buf_base != snf->overflow_buf)
{
- INTUSE(_IO_wsetb) (fp, snf->overflow_buf,
- snf->overflow_buf + (sizeof (snf->overflow_buf)
- / sizeof (wchar_t)), 0);
+ _IO_wsetb (fp, snf->overflow_buf,
+ snf->overflow_buf + (sizeof (snf->overflow_buf)
+ / sizeof (wchar_t)), 0);
fp->_wide_data->_IO_write_base = snf->overflow_buf;
fp->_wide_data->_IO_read_base = snf->overflow_buf;
@@ -72,15 +71,15 @@ const struct _IO_jump_t _IO_wstrn_jumps attribute_hidden =
JUMP_INIT(finish, _IO_wstr_finish),
JUMP_INIT(overflow, (_IO_overflow_t) _IO_wstrn_overflow),
JUMP_INIT(underflow, (_IO_underflow_t) _IO_wstr_underflow),
- JUMP_INIT(uflow, (_IO_underflow_t) INTUSE(_IO_wdefault_uflow)),
+ JUMP_INIT(uflow, (_IO_underflow_t) _IO_wdefault_uflow),
JUMP_INIT(pbackfail, (_IO_pbackfail_t) _IO_wstr_pbackfail),
- JUMP_INIT(xsputn, INTUSE(_IO_wdefault_xsputn)),
- JUMP_INIT(xsgetn, INTUSE(_IO_wdefault_xsgetn)),
+ JUMP_INIT(xsputn, _IO_wdefault_xsputn),
+ JUMP_INIT(xsgetn, _IO_wdefault_xsgetn),
JUMP_INIT(seekoff, _IO_wstr_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, _IO_default_setbuf),
JUMP_INIT(sync, _IO_default_sync),
- JUMP_INIT(doallocate, INTUSE(_IO_wdefault_doallocate)),
+ JUMP_INIT(doallocate, _IO_wdefault_doallocate),
JUMP_INIT(read, _IO_default_read),
JUMP_INIT(write, _IO_default_write),
JUMP_INIT(seek, _IO_default_seek),
diff --git a/libio/wfiledoalloc.c b/libio/wfiledoalloc.c
index d52ebb1..10f4270 100644
--- a/libio/wfiledoalloc.c
+++ b/libio/wfiledoalloc.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1997, 1999, 2000, 2002, 2006, 2012
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -87,7 +86,7 @@ _IO_wfile_doallocate (fp)
/* Allocate room for the external buffer. */
if (fp->_IO_buf_base == NULL)
- INTUSE(_IO_file_doallocate) (fp);
+ _IO_file_doallocate (fp);
/* If narrow buffer is user allocated (set by setvbuf etc.),
use that size as the size of the wide buffer, when it is
@@ -97,6 +96,6 @@ _IO_wfile_doallocate (fp)
if ((fp->_flags & _IO_USER_BUF))
size = (size + sizeof (wchar_t) - 1) / sizeof (wchar_t);
ALLOC_WBUF (p, size * sizeof (wchar_t), EOF);
- INTUSE(_IO_wsetb) (fp, p, p + size, 1);
+ _IO_wsetb (fp, p, p + size, 1);
return 1;
}
diff --git a/libio/wfileops.c b/libio/wfileops.c
index 13c2db5..3f628bf 100644
--- a/libio/wfileops.c
+++ b/libio/wfileops.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1995,1997-2004,2006,2009,2011 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper <drepper@cygnus.com>.
Based on the single byte version by Per Bothner <bothner@cygnus.com>.
@@ -112,7 +112,7 @@ _IO_wdo_write (fp, data, to_do)
return to_do == 0 ? 0 : WEOF;
}
-INTDEF(_IO_wdo_write)
+libc_hidden_def (_IO_wdo_write)
wint_t
@@ -183,7 +183,7 @@ _IO_wfile_underflow (fp)
free (fp->_IO_save_base);
fp->_flags &= ~_IO_IN_BACKUP;
}
- INTUSE(_IO_doallocbuf) (fp);
+ _IO_doallocbuf (fp);
fp->_IO_read_base = fp->_IO_read_ptr = fp->_IO_read_end =
fp->_IO_buf_base;
@@ -200,7 +200,7 @@ _IO_wfile_underflow (fp)
free (fp->_wide_data->_IO_save_base);
fp->_flags &= ~_IO_IN_BACKUP;
}
- INTUSE(_IO_wdoallocbuf) (fp);
+ _IO_wdoallocbuf (fp);
}
/* Flush all line buffered files before reading. */
@@ -208,7 +208,7 @@ _IO_wfile_underflow (fp)
if (fp->_flags & (_IO_LINE_BUF|_IO_UNBUFFERED))
{
#if 0
- INTUSE(_IO_flush_all_linebuffered) ();
+ _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
@@ -225,7 +225,7 @@ _IO_wfile_underflow (fp)
#endif
}
- INTUSE(_IO_switch_to_get_mode) (fp);
+ _IO_switch_to_get_mode (fp);
fp->_wide_data->_IO_read_base = fp->_wide_data->_IO_read_ptr =
fp->_wide_data->_IO_buf_base;
@@ -332,7 +332,7 @@ _IO_wfile_underflow (fp)
return *fp->_wide_data->_IO_read_ptr;
}
-INTDEF(_IO_wfile_underflow)
+libc_hidden_def (_IO_wfile_underflow)
static wint_t
@@ -371,7 +371,7 @@ _IO_wfile_underflow_mmap (_IO_FILE *fp)
free (fp->_wide_data->_IO_save_base);
fp->_flags &= ~_IO_IN_BACKUP;
}
- INTUSE(_IO_wdoallocbuf) (fp);
+ _IO_wdoallocbuf (fp);
}
fp->_wide_data->_IO_last_state = fp->_wide_data->_IO_state;
@@ -426,13 +426,13 @@ _IO_wfile_overflow (f, wch)
/* Allocate a buffer if needed. */
if (f->_wide_data->_IO_write_base == 0)
{
- INTUSE(_IO_wdoallocbuf) (f);
+ _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)
{
- INTUSE(_IO_doallocbuf) (f);
+ _IO_doallocbuf (f);
_IO_setg (f, f->_IO_buf_base, f->_IO_buf_base, f->_IO_buf_base);
}
}
@@ -481,7 +481,7 @@ _IO_wfile_overflow (f, wch)
return WEOF;
return wch;
}
-INTDEF(_IO_wfile_overflow)
+libc_hidden_def (_IO_wfile_overflow)
wint_t
_IO_wfile_sync (fp)
@@ -543,7 +543,7 @@ _IO_wfile_sync (fp)
/* setg(base(), ptr, ptr); */
return retval;
}
-INTDEF(_IO_wfile_sync)
+libc_hidden_def (_IO_wfile_sync)
_IO_off64_t
_IO_wfile_seekoff (fp, offset, dir, mode)
@@ -580,7 +580,7 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
/* There is no more data in the backup buffer. We can
switch back. */
- INTUSE(_IO_switch_to_main_wget_area) (fp);
+ _IO_switch_to_main_wget_area (fp);
}
dir = _IO_seek_cur, offset = 0; /* Don't move any pointers. */
@@ -596,7 +596,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 (INTUSE(_IO_switch_to_wget_mode) (fp))
+ if (_IO_switch_to_wget_mode (fp))
return WEOF;
if (fp->_wide_data->_IO_buf_base == NULL)
@@ -607,7 +607,7 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
free (fp->_wide_data->_IO_read_base);
fp->_flags &= ~_IO_IN_BACKUP;
}
- INTUSE(_IO_doallocbuf) (fp);
+ _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,
@@ -738,7 +738,7 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
return offset;
dumb:
- INTUSE(_IO_unsave_markers) (fp);
+ _IO_unsave_markers (fp);
result = _IO_SYSSEEK (fp, offset, dir);
if (result != EOF)
{
@@ -763,7 +763,7 @@ resync:
return offset;
}
-INTDEF(_IO_wfile_seekoff)
+libc_hidden_def (_IO_wfile_seekoff)
_IO_size_t
@@ -829,38 +829,38 @@ _IO_wfile_xsputn (f, data, n)
to_do -= count;
}
if (to_do > 0)
- to_do -= INTUSE(_IO_wdefault_xsputn) (f, s, to_do);
+ to_do -= _IO_wdefault_xsputn (f, s, to_do);
if (must_flush
&& 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);
+ _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)
+libc_hidden_def (_IO_wfile_xsputn)
const struct _IO_jump_t _IO_wfile_jumps =
{
JUMP_INIT_DUMMY,
JUMP_INIT(finish, _IO_new_file_finish),
- 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(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(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, _IO_new_file_setbuf),
- JUMP_INIT(sync, (_IO_sync_t) INTUSE(_IO_wfile_sync)),
+ JUMP_INIT(sync, (_IO_sync_t) _IO_wfile_sync),
JUMP_INIT(doallocate, _IO_wfile_doallocate),
- JUMP_INIT(read, INTUSE(_IO_file_read)),
+ JUMP_INIT(read, _IO_file_read),
JUMP_INIT(write, _IO_new_file_write),
- JUMP_INIT(seek, INTUSE(_IO_file_seek)),
- JUMP_INIT(close, INTUSE(_IO_file_close)),
- JUMP_INIT(stat, INTUSE(_IO_file_stat)),
+ JUMP_INIT(seek, _IO_file_seek),
+ JUMP_INIT(close, _IO_file_close),
+ JUMP_INIT(stat, _IO_file_stat),
JUMP_INIT(showmanyc, _IO_default_showmanyc),
JUMP_INIT(imbue, _IO_default_imbue)
};
@@ -871,22 +871,22 @@ const struct _IO_jump_t _IO_wfile_jumps_mmap =
{
JUMP_INIT_DUMMY,
JUMP_INIT(finish, _IO_new_file_finish),
- JUMP_INIT(overflow, (_IO_overflow_t) INTUSE(_IO_wfile_overflow)),
+ JUMP_INIT(overflow, (_IO_overflow_t) _IO_wfile_overflow),
JUMP_INIT(underflow, (_IO_underflow_t) _IO_wfile_underflow_mmap),
- 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(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(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, _IO_file_setbuf_mmap),
- JUMP_INIT(sync, (_IO_sync_t) INTUSE(_IO_wfile_sync)),
+ JUMP_INIT(sync, (_IO_sync_t) _IO_wfile_sync),
JUMP_INIT(doallocate, _IO_wfile_doallocate),
- JUMP_INIT(read, INTUSE(_IO_file_read)),
+ JUMP_INIT(read, _IO_file_read),
JUMP_INIT(write, _IO_new_file_write),
- JUMP_INIT(seek, INTUSE(_IO_file_seek)),
+ JUMP_INIT(seek, _IO_file_seek),
JUMP_INIT(close, _IO_file_close_mmap),
- JUMP_INIT(stat, INTUSE(_IO_file_stat)),
+ JUMP_INIT(stat, _IO_file_stat),
JUMP_INIT(showmanyc, _IO_default_showmanyc),
JUMP_INIT(imbue, _IO_default_imbue)
};
@@ -895,22 +895,22 @@ const struct _IO_jump_t _IO_wfile_jumps_maybe_mmap =
{
JUMP_INIT_DUMMY,
JUMP_INIT(finish, _IO_new_file_finish),
- JUMP_INIT(overflow, (_IO_overflow_t) INTUSE(_IO_wfile_overflow)),
+ JUMP_INIT(overflow, (_IO_overflow_t) _IO_wfile_overflow),
JUMP_INIT(underflow, (_IO_underflow_t) _IO_wfile_underflow_maybe_mmap),
- 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(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(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, _IO_file_setbuf_mmap),
- JUMP_INIT(sync, (_IO_sync_t) INTUSE(_IO_wfile_sync)),
+ JUMP_INIT(sync, (_IO_sync_t) _IO_wfile_sync),
JUMP_INIT(doallocate, _IO_wfile_doallocate),
- JUMP_INIT(read, INTUSE(_IO_file_read)),
+ JUMP_INIT(read, _IO_file_read),
JUMP_INIT(write, _IO_new_file_write),
- JUMP_INIT(seek, INTUSE(_IO_file_seek)),
- JUMP_INIT(close, INTUSE(_IO_file_close)),
- JUMP_INIT(stat, INTUSE(_IO_file_stat)),
+ JUMP_INIT(seek, _IO_file_seek),
+ JUMP_INIT(close, _IO_file_close),
+ JUMP_INIT(stat, _IO_file_stat),
JUMP_INIT(showmanyc, _IO_default_showmanyc),
JUMP_INIT(imbue, _IO_default_imbue)
};
diff --git a/libio/wgenops.c b/libio/wgenops.c
index 886b25e..f8f27b0 100644
--- a/libio/wgenops.c
+++ b/libio/wgenops.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993,1995,1997-2002,2004,2006,2012
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper <drepper@cygnus.com>.
Based on the single byte version by Per Bothner <bothner@cygnus.com>.
@@ -48,8 +47,6 @@ static int save_for_wbackup (_IO_FILE *fp, wchar_t *end_p) __THROW
/* Return minimum _pos markers
Assumes the current get area is the main get area. */
-_IO_ssize_t _IO_least_wmarker (_IO_FILE *fp, wchar_t *end_p) __THROW;
-
_IO_ssize_t
_IO_least_wmarker (fp, end_p)
_IO_FILE *fp;
@@ -62,7 +59,7 @@ _IO_least_wmarker (fp, end_p)
least_so_far = mark->_pos;
return least_so_far;
}
-INTDEF(_IO_least_wmarker)
+libc_hidden_def (_IO_least_wmarker)
/* Switch current get area from backup buffer to (start of) main get area. */
void
@@ -82,7 +79,7 @@ _IO_switch_to_main_wget_area (fp)
/* Set _IO_read_ptr. */
fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_base;
}
-INTDEF(_IO_switch_to_main_wget_area)
+libc_hidden_def (_IO_switch_to_main_wget_area)
/* Switch current get area from main get area to (end of) backup area. */
@@ -103,7 +100,7 @@ _IO_switch_to_wbackup_area (fp)
/* Set _IO_read_ptr. */
fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_end;
}
-INTDEF(_IO_switch_to_wbackup_area)
+libc_hidden_def (_IO_switch_to_wbackup_area)
void
@@ -122,7 +119,7 @@ _IO_wsetb (f, b, eb, a)
else
f->_flags2 |= _IO_FLAGS2_USER_WBUF;
}
-INTDEF(_IO_wsetb)
+libc_hidden_def (_IO_wsetb)
wint_t
@@ -162,7 +159,7 @@ _IO_wdefault_pbackfail (fp, c)
fp->_wide_data->_IO_backup_base = fp->_wide_data->_IO_save_end;
}
fp->_wide_data->_IO_read_base = fp->_wide_data->_IO_read_ptr;
- INTUSE(_IO_switch_to_wbackup_area) (fp);
+ _IO_switch_to_wbackup_area (fp);
}
else if (fp->_wide_data->_IO_read_ptr <= fp->_wide_data->_IO_read_base)
{
@@ -187,7 +184,7 @@ _IO_wdefault_pbackfail (fp, c)
}
return c;
}
-INTDEF(_IO_wdefault_pbackfail)
+libc_hidden_def (_IO_wdefault_pbackfail)
void
@@ -217,9 +214,9 @@ _IO_wdefault_finish (fp, dummy)
_IO_lock_fini (*fp->_lock);
#endif
- INTUSE(_IO_un_link) ((struct _IO_FILE_plus *) fp);
+ _IO_un_link ((struct _IO_FILE_plus *) fp);
}
-INTDEF(_IO_wdefault_finish)
+libc_hidden_def (_IO_wdefault_finish)
wint_t
@@ -232,7 +229,7 @@ _IO_wdefault_uflow (fp)
return WEOF;
return *fp->_wide_data->_IO_read_ptr++;
}
-INTDEF(_IO_wdefault_uflow)
+libc_hidden_def (_IO_wdefault_uflow)
wint_t
@@ -257,13 +254,13 @@ __wuflow (fp)
if (fp->_mode == 0)
_IO_fwide (fp, 1);
if (_IO_in_put_mode (fp))
- if (INTUSE(_IO_switch_to_wget_mode) (fp) == EOF)
+ if (_IO_switch_to_wget_mode (fp) == EOF)
return WEOF;
if (fp->_wide_data->_IO_read_ptr < fp->_wide_data->_IO_read_end)
return *fp->_wide_data->_IO_read_ptr++;
if (_IO_in_backup (fp))
{
- INTUSE(_IO_switch_to_main_wget_area) (fp);
+ _IO_switch_to_main_wget_area (fp);
if (fp->_wide_data->_IO_read_ptr < fp->_wide_data->_IO_read_end)
return *fp->_wide_data->_IO_read_ptr++;
}
@@ -273,7 +270,7 @@ __wuflow (fp)
return WEOF;
}
else if (_IO_have_wbackup (fp))
- INTUSE(_IO_free_wbackup_area) (fp);
+ _IO_free_wbackup_area (fp);
return _IO_UFLOW (fp);
}
libc_hidden_def (__wuflow)
@@ -288,13 +285,13 @@ __wunderflow (fp)
if (fp->_mode == 0)
_IO_fwide (fp, 1);
if (_IO_in_put_mode (fp))
- if (INTUSE(_IO_switch_to_wget_mode) (fp) == EOF)
+ if (_IO_switch_to_wget_mode (fp) == EOF)
return WEOF;
if (fp->_wide_data->_IO_read_ptr < fp->_wide_data->_IO_read_end)
return *fp->_wide_data->_IO_read_ptr;
if (_IO_in_backup (fp))
{
- INTUSE(_IO_switch_to_main_wget_area) (fp);
+ _IO_switch_to_main_wget_area (fp);
if (fp->_wide_data->_IO_read_ptr < fp->_wide_data->_IO_read_end)
return *fp->_wide_data->_IO_read_ptr;
}
@@ -304,7 +301,7 @@ __wunderflow (fp)
return WEOF;
}
else if (_IO_have_backup (fp))
- INTUSE(_IO_free_wbackup_area) (fp);
+ _IO_free_wbackup_area (fp);
return _IO_UNDERFLOW (fp);
}
libc_hidden_def (__wunderflow)
@@ -358,7 +355,7 @@ _IO_wdefault_xsputn (f, data, n)
}
return n - more;
}
-INTDEF(_IO_wdefault_xsputn)
+libc_hidden_def (_IO_wdefault_xsputn)
_IO_size_t
@@ -405,7 +402,7 @@ _IO_wdefault_xsgetn (fp, data, n)
}
return n - more;
}
-INTDEF(_IO_wdefault_xsgetn)
+libc_hidden_def (_IO_wdefault_xsgetn)
void
@@ -417,10 +414,10 @@ _IO_wdoallocbuf (fp)
if (!(fp->_flags & _IO_UNBUFFERED))
if ((wint_t)_IO_WDOALLOCATE (fp) != WEOF)
return;
- INTUSE(_IO_wsetb) (fp, fp->_wide_data->_shortbuf,
+ _IO_wsetb (fp, fp->_wide_data->_shortbuf,
fp->_wide_data->_shortbuf + 1, 0);
}
-INTDEF(_IO_wdoallocbuf)
+libc_hidden_def (_IO_wdoallocbuf)
int
@@ -430,10 +427,10 @@ _IO_wdefault_doallocate (fp)
wchar_t *buf;
ALLOC_WBUF (buf, _IO_BUFSIZ, EOF);
- INTUSE(_IO_wsetb) (fp, buf, buf + _IO_BUFSIZ, 1);
+ _IO_wsetb (fp, buf, buf + _IO_BUFSIZ, 1);
return 1;
}
-INTDEF(_IO_wdefault_doallocate)
+libc_hidden_def (_IO_wdefault_doallocate)
int
@@ -459,20 +456,20 @@ _IO_switch_to_wget_mode (fp)
fp->_flags &= ~_IO_CURRENTLY_PUTTING;
return 0;
}
-INTDEF(_IO_switch_to_wget_mode)
+libc_hidden_def (_IO_switch_to_wget_mode)
void
_IO_free_wbackup_area (fp)
_IO_FILE *fp;
{
if (_IO_in_backup (fp))
- INTUSE(_IO_switch_to_main_wget_area) (fp); /* Just in case. */
+ _IO_switch_to_main_wget_area (fp); /* Just in case. */
free (fp->_wide_data->_IO_save_base);
fp->_wide_data->_IO_save_base = NULL;
fp->_wide_data->_IO_save_end = NULL;
fp->_wide_data->_IO_backup_base = NULL;
}
-INTDEF(_IO_free_wbackup_area)
+libc_hidden_def (_IO_free_wbackup_area)
#if 0
int
@@ -504,7 +501,7 @@ save_for_wbackup (fp, end_p)
wchar_t *end_p;
{
/* Append [_IO_read_base..end_p] to backup area. */
- _IO_ssize_t least_mark = INTUSE(_IO_least_wmarker) (fp, end_p);
+ _IO_ssize_t least_mark = _IO_least_wmarker (fp, end_p);
/* needed_size is how much space we need in the backup area. */
_IO_size_t needed_size = ((end_p - fp->_wide_data->_IO_read_base)
- least_mark);
@@ -616,7 +613,7 @@ _IO_sputbackwc (fp, c)
return result;
}
-INTDEF(_IO_sputbackwc)
+libc_hidden_def (_IO_sputbackwc)
wint_t
_IO_sungetwc (fp)
@@ -659,7 +656,7 @@ _IO_init_wmarker (marker, fp)
{
marker->_sbuf = fp;
if (_IO_in_put_mode (fp))
- INTUSE(_IO_switch_to_wget_mode) (fp);
+ _IO_switch_to_wget_mode (fp);
if (_IO_in_backup (fp))
marker->_pos = fp->_wide_data->_IO_read_ptr - fp->_wide_data->_IO_read_end;
else
@@ -701,14 +698,14 @@ _IO_seekwmark (fp, mark, delta)
if (mark->_pos >= 0)
{
if (_IO_in_backup (fp))
- INTUSE(_IO_switch_to_main_wget_area) (fp);
+ _IO_switch_to_main_wget_area (fp);
fp->_wide_data->_IO_read_ptr = (fp->_wide_data->_IO_read_base
+ mark->_pos);
}
else
{
if (!_IO_in_backup (fp))
- INTUSE(_IO_switch_to_wbackup_area) (fp);
+ _IO_switch_to_wbackup_area (fp);
fp->_wide_data->_IO_read_ptr = fp->_wide_data->_IO_read_end + mark->_pos;
}
return 0;
@@ -739,5 +736,5 @@ _IO_unsave_wmarkers (fp)
}
if (_IO_have_backup (fp))
- INTUSE(_IO_free_wbackup_area) (fp);
+ _IO_free_wbackup_area (fp);
}
diff --git a/libio/wmemstream.c b/libio/wmemstream.c
index 83ba52e..f6b505f 100644
--- a/libio/wmemstream.c
+++ b/libio/wmemstream.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995-97,99,2000,2002-2004,2006 Free Software Foundation, Inc.
+/* Copyright (C) 1995-2012 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
@@ -40,15 +40,15 @@ static const struct _IO_jump_t _IO_wmem_jumps =
JUMP_INIT (finish, _IO_wmem_finish),
JUMP_INIT (overflow, (_IO_overflow_t) _IO_wstr_overflow),
JUMP_INIT (underflow, (_IO_underflow_t) _IO_wstr_underflow),
- JUMP_INIT (uflow, (_IO_underflow_t) INTUSE(_IO_wdefault_uflow)),
+ JUMP_INIT (uflow, (_IO_underflow_t) _IO_wdefault_uflow),
JUMP_INIT (pbackfail, (_IO_pbackfail_t) _IO_wstr_pbackfail),
- JUMP_INIT (xsputn, INTUSE(_IO_wdefault_xsputn)),
- JUMP_INIT (xsgetn, INTUSE(_IO_wdefault_xsgetn)),
+ JUMP_INIT (xsputn, _IO_wdefault_xsputn),
+ JUMP_INIT (xsgetn, _IO_wdefault_xsgetn),
JUMP_INIT (seekoff, _IO_wstr_seekoff),
JUMP_INIT (seekpos, _IO_default_seekpos),
JUMP_INIT (setbuf, _IO_default_setbuf),
JUMP_INIT (sync, _IO_wmem_sync),
- JUMP_INIT (doallocate, INTUSE(_IO_wdefault_doallocate)),
+ JUMP_INIT (doallocate, _IO_wdefault_doallocate),
JUMP_INIT (read, _IO_default_read),
JUMP_INIT (write, _IO_default_write),
JUMP_INIT (seek, _IO_default_seek),
diff --git a/libio/wstrops.c b/libio/wstrops.c
index 3e26b13..1c0f7e2 100644
--- a/libio/wstrops.c
+++ b/libio/wstrops.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1997-1999,2001-2004, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -48,7 +48,7 @@ _IO_wstr_init_static (fp, ptr, size, pstart)
/* Even for misaligned ptr make sure there is integral number of wide
characters. */
end = ptr + (-1 - (_IO_size_t) ptr) / sizeof (wchar_t);
- INTUSE(_IO_wsetb) (fp, ptr, end, 0);
+ _IO_wsetb (fp, ptr, end, 0);
fp->_wide_data->_IO_write_base = ptr;
fp->_wide_data->_IO_read_base = ptr;
@@ -115,7 +115,7 @@ _IO_wstr_overflow (fp, c)
wmemset (new_buf + old_wblen, L'\0', new_size - old_wblen);
- INTUSE(_IO_wsetb) (fp, new_buf, new_buf + new_size, 1);
+ _IO_wsetb (fp, new_buf, new_buf + new_size, 1);
fp->_wide_data->_IO_read_base =
new_buf + (fp->_wide_data->_IO_read_base - old_buf);
fp->_wide_data->_IO_read_ptr =
@@ -202,7 +202,7 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading)
wd->_IO_buf_base = NULL;
}
- INTUSE(_IO_wsetb) (fp, newbuf, newbuf + newsize, 1);
+ _IO_wsetb (fp, newbuf, newbuf + newsize, 1);
if (reading)
{
@@ -326,7 +326,7 @@ _IO_wstr_pbackfail (fp, c)
{
if ((fp->_flags & _IO_NO_WRITES) && c != WEOF)
return WEOF;
- return INTUSE(_IO_wdefault_pbackfail) (fp, c);
+ return _IO_wdefault_pbackfail (fp, c);
}
void
@@ -338,7 +338,7 @@ _IO_wstr_finish (fp, dummy)
(((_IO_strfile *) fp)->_s._free_buffer) (fp->_wide_data->_IO_buf_base);
fp->_wide_data->_IO_buf_base = NULL;
- INTUSE(_IO_wdefault_finish) (fp, 0);
+ _IO_wdefault_finish (fp, 0);
}
const struct _IO_jump_t _IO_wstr_jumps =
@@ -347,15 +347,15 @@ const struct _IO_jump_t _IO_wstr_jumps =
JUMP_INIT(finish, _IO_wstr_finish),
JUMP_INIT(overflow, (_IO_overflow_t) _IO_wstr_overflow),
JUMP_INIT(underflow, (_IO_underflow_t) _IO_wstr_underflow),
- JUMP_INIT(uflow, (_IO_underflow_t) INTUSE(_IO_wdefault_uflow)),
+ JUMP_INIT(uflow, (_IO_underflow_t) _IO_wdefault_uflow),
JUMP_INIT(pbackfail, (_IO_pbackfail_t) _IO_wstr_pbackfail),
- JUMP_INIT(xsputn, INTUSE(_IO_wdefault_xsputn)),
- JUMP_INIT(xsgetn, INTUSE(_IO_wdefault_xsgetn)),
+ JUMP_INIT(xsputn, _IO_wdefault_xsputn),
+ JUMP_INIT(xsgetn, _IO_wdefault_xsgetn),
JUMP_INIT(seekoff, _IO_wstr_seekoff),
JUMP_INIT(seekpos, _IO_default_seekpos),
JUMP_INIT(setbuf, _IO_default_setbuf),
JUMP_INIT(sync, _IO_default_sync),
- JUMP_INIT(doallocate, INTUSE(_IO_wdefault_doallocate)),
+ JUMP_INIT(doallocate, _IO_wdefault_doallocate),
JUMP_INIT(read, _IO_default_read),
JUMP_INIT(write, _IO_default_write),
JUMP_INIT(seek, _IO_default_seek),
diff --git a/malloc/mtrace.c b/malloc/mtrace.c
index e299a16..d1049c9 100644
--- a/malloc/mtrace.c
+++ b/malloc/mtrace.c
@@ -1,5 +1,5 @@
/* More debugging hooks for `malloc'.
- Copyright (C) 1991-1994,1996-2004, 2008, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1991-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written April 2, 1991 by John Gilmore of Cygnus Support.
Based on mcheck.c by Mike Haertel.
@@ -36,7 +36,7 @@
#include <libc-internal.h>
#include <libio/iolibio.h>
-#define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
+#define setvbuf(s, b, f, l) _IO_setvbuf (s, b, f, l)
#define fwrite(buf, size, count, fp) _IO_fwrite (buf, size, count, fp)
#include <kernel-features.h>
diff --git a/misc/error.c b/misc/error.c
index bb60078..6fb192d 100644
--- a/misc/error.c
+++ b/misc/error.c
@@ -1,5 +1,5 @@
/* Error handler for noninteractive utilities
- Copyright (C) 1990-1998, 2000-2006, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1990-2012 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
@@ -69,9 +69,9 @@ extern void __error_at_line (int status, int errnum, const char *file_name,
# define error_at_line __error_at_line
# include <libio/iolibio.h>
-# define fflush(s) INTUSE(_IO_fflush) (s)
+# define fflush(s) _IO_fflush (s)
# undef putc
-# define putc(c, fp) INTUSE(_IO_putc) (c, fp)
+# define putc(c, fp) _IO_putc (c, fp)
# include <bits/libc-lock.h>
diff --git a/misc/syslog.c b/misc/syslog.c
index 4e18883..748361f 100644
--- a/misc/syslog.c
+++ b/misc/syslog.c
@@ -58,7 +58,7 @@ static char sccsid[] = "@(#)syslog.c 8.4 (Berkeley) 3/18/94";
#include <kernel-features.h>
-#define ftell(s) INTUSE(_IO_ftell) (s)
+#define ftell(s) _IO_ftell (s)
static int LogType = SOCK_DGRAM; /* type of socket connection */
static int LogFile = -1; /* fd for log */
diff --git a/stdio-common/asprintf.c b/stdio-common/asprintf.c
index 1f58a20..c98de3f 100644
--- a/stdio-common/asprintf.c
+++ b/stdio-common/asprintf.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1991, 1995, 1997, 1998, 2002, 2004, 2006
- Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -38,7 +37,7 @@ ___asprintf (char **string_ptr, const char *format, ...)
return done;
}
-INTDEF2(___asprintf, __asprintf)
+ldbl_hidden_def (___asprintf, __asprintf)
ldbl_strong_alias (___asprintf, __asprintf)
ldbl_weak_alias (___asprintf, asprintf)
diff --git a/stdio-common/fxprintf.c b/stdio-common/fxprintf.c
index 3c13414..a63cf54 100644
--- a/stdio-common/fxprintf.c
+++ b/stdio-common/fxprintf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2005-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.org>.
@@ -47,7 +47,7 @@ __fxprintf (FILE *fp, const char *fmt, ...)
res = __vfwprintf (fp, wfmt, ap);
}
else
- res = INTUSE(_IO_vfprintf) (fp, fmt, ap);
+ res = _IO_vfprintf (fp, fmt, ap);
va_end (ap);
diff --git a/stdio-common/getw.c b/stdio-common/getw.c
index 2cd5ab0..34b82c3 100644
--- a/stdio-common/getw.c
+++ b/stdio-common/getw.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -18,7 +18,7 @@
#include <stdio.h>
#include <libio/iolibio.h>
-#define fread(p, m, n, s) INTUSE(_IO_fread) (p, m, n, s)
+#define fread(p, m, n, s) _IO_fread (p, m, n, s)
/* Read a word (int) from STREAM. */
int
diff --git a/stdio-common/isoc99_fscanf.c b/stdio-common/isoc99_fscanf.c
index 6e5e33d..4b689fa 100644
--- a/stdio-common/isoc99_fscanf.c
+++ b/stdio-common/isoc99_fscanf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -31,7 +31,7 @@ __isoc99_fscanf (FILE *stream, const char *format, ...)
stream->_flags2 |= _IO_FLAGS2_SCANF_STD;
va_start (arg, format);
- done = INTUSE(_IO_vfscanf) (stream, format, arg, NULL);
+ done = _IO_vfscanf (stream, format, arg, NULL);
va_end (arg);
_IO_release_lock (stream);
diff --git a/stdio-common/isoc99_scanf.c b/stdio-common/isoc99_scanf.c
index d91ef94..2e04e70 100644
--- a/stdio-common/isoc99_scanf.c
+++ b/stdio-common/isoc99_scanf.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2002, 2004, 2006, 2007
- Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -33,7 +32,7 @@ __isoc99_scanf (const char *format, ...)
stdin->_flags2 |= _IO_FLAGS2_SCANF_STD;
va_start (arg, format);
- done = INTUSE(_IO_vfscanf) (stdin, format, arg, NULL);
+ done = _IO_vfscanf (stdin, format, arg, NULL);
va_end (arg);
_IO_release_lock (stdin);
diff --git a/stdio-common/isoc99_vfscanf.c b/stdio-common/isoc99_vfscanf.c
index 658d5ff..bd6087b 100644
--- a/stdio-common/isoc99_vfscanf.c
+++ b/stdio-common/isoc99_vfscanf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -27,7 +27,7 @@ __isoc99_vfscanf (FILE *stream, const char *format, _IO_va_list args)
_IO_acquire_lock_clear_flags2 (stream);
stream->_flags2 |= _IO_FLAGS2_SCANF_STD;
- done = INTUSE(_IO_vfscanf) (stream, format, args, NULL);
+ done = _IO_vfscanf (stream, format, args, NULL);
_IO_release_lock (stream);
return done;
}
diff --git a/stdio-common/isoc99_vscanf.c b/stdio-common/isoc99_vscanf.c
index c9c187c..4d9f3b8 100644
--- a/stdio-common/isoc99_vscanf.c
+++ b/stdio-common/isoc99_vscanf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -27,7 +27,7 @@ __isoc99_vscanf (const char *format, _IO_va_list args)
_IO_acquire_lock_clear_flags2 (stdin);
stdin->_flags2 |= _IO_FLAGS2_SCANF_STD;
- done = INTUSE(_IO_vfscanf) (stdin, format, args, NULL);
+ done = _IO_vfscanf (stdin, format, args, NULL);
_IO_release_lock (stdin);
return done;
}
diff --git a/stdio-common/isoc99_vsscanf.c b/stdio-common/isoc99_vsscanf.c
index 628856a..a6dc007 100644
--- a/stdio-common/isoc99_vsscanf.c
+++ b/stdio-common/isoc99_vsscanf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,1997-2003,2006,2007,2009 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2012 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
@@ -40,7 +40,7 @@ __isoc99_vsscanf (const char *string, const char *format, _IO_va_list args)
_IO_JUMPS (&sf._sbf) = &_IO_str_jumps;
_IO_str_init_static_internal (&sf, (char*)string, 0, NULL);
sf._sbf._f._flags2 |= _IO_FLAGS2_SCANF_STD;
- ret = INTUSE(_IO_vfscanf) (&sf._sbf._f, format, args, NULL);
+ ret = _IO_vfscanf (&sf._sbf._f, format, args, NULL);
return ret;
}
libc_hidden_def (__isoc99_vsscanf)
diff --git a/stdio-common/printf-prs.c b/stdio-common/printf-prs.c
index 68a9c61..32f08ba 100644
--- a/stdio-common/printf-prs.c
+++ b/stdio-common/printf-prs.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1991, 1992, 1995, 1996, 1999, 2000, 2002-2005, 2007, 2009
- Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -37,7 +36,7 @@
# define PUT(F, S, N) _IO_sputn (F, S, N)
# define PAD(Padchar) \
if (width > 0) \
- done += INTUSE(_IO_padn) (s, Padchar, width)
+ done += _IO_padn (s, Padchar, width)
#else
# define vfprintf vfwprintf
# define CHAR_T wchar_t
diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
index 46f9e3e..5f3c904 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-2003, 2006-2008, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1995-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
@@ -56,7 +56,7 @@
/* This defines make it possible to use the same code for GNU C library and
the GNU I/O library. */
#define PUT(f, s, n) _IO_sputn (f, s, n)
-#define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : INTUSE(_IO_padn) (f, c, n))
+#define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : _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_fphex.c b/stdio-common/printf_fphex.c
index 97ed83b..1349145 100644
--- a/stdio-common/printf_fphex.c
+++ b/stdio-common/printf_fphex.c
@@ -1,5 +1,5 @@
/* Print floating point number in hexadecimal notation according to ISO C99.
- Copyright (C) 1997-2002,2004,2006,2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -36,7 +36,7 @@
the GNU I/O library. */
#include <libioP.h>
#define PUT(f, s, n) _IO_sputn (f, s, n)
-#define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : INTUSE(_IO_padn) (f, c, n))
+#define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : _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 06cbb06..9f87006 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-2002, 2004, 2006, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
Based on a proposal by Larry McVoy <lm@sgi.com>.
@@ -28,7 +28,7 @@
/* This defines make it possible to use the same code for GNU C library and
the GNU I/O library. */
#define PUT(f, s, n) _IO_sputn (f, s, n)
-#define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : INTUSE(_IO_padn) (f, c, n))
+#define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : _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 ecfdcd8..09902bf 100644
--- a/stdio-common/putw.c
+++ b/stdio-common/putw.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997, 1998, 2002, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -17,7 +17,7 @@
#include <stdio.h>
#include <libio/iolibio.h>
-#define fwrite(p, n, m, s) INTUSE(_IO_fwrite) (p, n, m, s)
+#define fwrite(p, n, m, s) _IO_fwrite (p, n, m, s)
/* Write the word (int) W to STREAM. */
int
diff --git a/stdio-common/scanf.c b/stdio-common/scanf.c
index e7ef18d..0a8eecf 100644
--- a/stdio-common/scanf.c
+++ b/stdio-common/scanf.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 2002, 2004, 2006
- Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -31,7 +30,7 @@ __scanf (const char *format, ...)
int done;
va_start (arg, format);
- done = INTUSE(_IO_vfscanf) (stdin, format, arg, NULL);
+ done = _IO_vfscanf (stdin, format, arg, NULL);
va_end (arg);
return done;
diff --git a/stdio-common/sprintf.c b/stdio-common/sprintf.c
index 817844a..00be3bd 100644
--- a/stdio-common/sprintf.c
+++ b/stdio-common/sprintf.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 1991, 1995, 1997, 1998, 2002, 2004, 2006
- Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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,7 +18,7 @@
#include <stdarg.h>
#include <stdio.h>
#include <libioP.h>
-#define vsprintf(s, f, a) INTUSE(_IO_vsprintf) (s, f, a)
+#define vsprintf(s, f, a) _IO_vsprintf (s, f, a)
/* Write formatted output into S, according to the format string FORMAT. */
/* VARARGS2 */
diff --git a/stdio-common/tmpfile.c b/stdio-common/tmpfile.c
index 113999b..c6da9ac 100644
--- a/stdio-common/tmpfile.c
+++ b/stdio-common/tmpfile.c
@@ -1,6 +1,5 @@
/* Open a stdio stream on an anonymous temporary file. Generic/POSIX version.
- Copyright (C) 1991,1993,1996-2000,2002,2003,2007,2009,2011
- Free Software Foundation, Inc.
+ Copyright (C) 1991-2012 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
@@ -22,7 +21,7 @@
#include <unistd.h>
#include <iolibio.h>
-#define __fdopen INTUSE(_IO_fdopen)
+#define __fdopen _IO_fdopen
#ifndef tmpfile
# define tmpfile __new_tmpfile
#endif
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 463f9c0..d569034 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -88,7 +88,7 @@
# define PUT(F, S, N) _IO_sputn ((F), (S), (N))
# define PAD(Padchar) \
if (width > 0) \
- done_add (INTUSE(_IO_padn) (s, (Padchar), width))
+ done_add (_IO_padn (s, (Padchar), width))
# define PUTC(C, F) _IO_putc_unlocked (C, F)
# define ORIENT if (_IO_vtable_offset (s) == 0 && _IO_fwide (s, -1) != -1)\
return -1
@@ -2227,18 +2227,18 @@ _IO_helper_overflow (_IO_FILE *s, int c)
static const struct _IO_jump_t _IO_helper_jumps =
{
JUMP_INIT_DUMMY,
- JUMP_INIT (finish, INTUSE(_IO_wdefault_finish)),
+ JUMP_INIT (finish, _IO_wdefault_finish),
JUMP_INIT (overflow, _IO_helper_overflow),
JUMP_INIT (underflow, _IO_default_underflow),
- 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 (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 (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, INTUSE(_IO_wdefault_doallocate)),
+ JUMP_INIT (doallocate, _IO_wdefault_doallocate),
JUMP_INIT (read, _IO_default_read),
JUMP_INIT (write, _IO_default_write),
JUMP_INIT (seek, _IO_default_seek),
@@ -2249,18 +2249,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, INTUSE(_IO_default_finish)),
+ JUMP_INIT (finish, _IO_default_finish),
JUMP_INIT (overflow, _IO_helper_overflow),
JUMP_INIT (underflow, _IO_default_underflow),
- 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 (uflow, _IO_default_uflow),
+ JUMP_INIT (pbackfail, _IO_default_pbackfail),
+ JUMP_INIT (xsputn, _IO_default_xsputn),
+ JUMP_INIT (xsgetn, _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, INTUSE(_IO_default_doallocate)),
+ JUMP_INIT (doallocate, _IO_default_doallocate),
JUMP_INIT (read, _IO_default_read),
JUMP_INIT (write, _IO_default_write),
JUMP_INIT (seek, _IO_default_seek),
@@ -2306,7 +2306,7 @@ buffered_vfprintf (register _IO_FILE *s, const CHAR_T *format,
/* Now print to helper instead. */
#ifndef COMPILE_WPRINTF
- result = INTUSE(_IO_vfprintf) (hp, format, args);
+ result = _IO_vfprintf (hp, format, args);
#else
result = vfprintf (hp, format, args);
#endif
@@ -2347,4 +2347,5 @@ ldbl_weak_alias (_IO_vfwprintf, vfwprintf);
ldbl_strong_alias (_IO_vfprintf_internal, vfprintf);
ldbl_hidden_def (_IO_vfprintf_internal, vfprintf)
ldbl_strong_alias (_IO_vfprintf_internal, _IO_vfprintf);
+ldbl_hidden_def (_IO_vfprintf_internal, _IO_vfprintf)
#endif
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index ae25155..23a8ac7 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2007, 2010, 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -77,9 +77,9 @@
#ifdef COMPILE_WSCANF
# define ungetc(c, s) ((void) (c == WEOF \
|| (--read_in, \
- INTUSE(_IO_sputbackwc) (s, c))))
+ _IO_sputbackwc (s, c))))
# define ungetc_not_eof(c, s) ((void) (--read_in, \
- INTUSE(_IO_sputbackwc) (s, c)))
+ _IO_sputbackwc (s, c)))
# define inchar() (c == WEOF ? ((errno = inchar_errno), WEOF) \
: ((c = _IO_getwc_unlocked (s)), \
(void) (c != WEOF \
@@ -109,9 +109,9 @@
#else
# define ungetc(c, s) ((void) ((int) c == EOF \
|| (--read_in, \
- INTUSE(_IO_sputbackc) (s, (unsigned char) c))))
+ _IO_sputbackc (s, (unsigned char) c))))
# define ungetc_not_eof(c, s) ((void) (--read_in, \
- INTUSE(_IO_sputbackc) (s, (unsigned char) c)))
+ _IO_sputbackc (s, (unsigned char) c)))
# define inchar() (c == EOF ? ((errno = inchar_errno), EOF) \
: ((c = _IO_getc_unlocked (s)), \
(void) (c != EOF \
@@ -2941,6 +2941,7 @@ ___vfscanf (FILE *s, const char *format, va_list argptr)
return _IO_vfscanf_internal (s, format, argptr, NULL);
}
ldbl_strong_alias (_IO_vfscanf_internal, _IO_vfscanf)
+ldbl_hidden_def (_IO_vfscanf_internal, _IO_vfscanf)
ldbl_strong_alias (___vfscanf, __vfscanf)
ldbl_hidden_def (___vfscanf, __vfscanf)
ldbl_weak_alias (___vfscanf, vfscanf)
diff --git a/stdlib/strfmon_l.c b/stdlib/strfmon_l.c
index d3e9d71..8fb7dec 100644
--- a/stdlib/strfmon_l.c
+++ b/stdlib/strfmon_l.c
@@ -1,5 +1,5 @@
/* Formatting a monetary value according to the given locale.
- Copyright (C) 1996,1997,2002,2004,2006,2009,2010 Free Software Foundation, Inc.
+ Copyright (C) 1996-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
@@ -515,10 +515,9 @@ __vstrfmon_l (char *s, size_t maxsize, __locale_t loc, const char *format,
#ifdef _IO_MTSAFE_IO
f._sbf._f._lock = NULL;
#endif
- INTUSE(_IO_init) (&f._sbf._f, 0);
+ _IO_init (&f._sbf._f, 0);
_IO_JUMPS (&f._sbf) = &_IO_str_jumps;
- INTUSE(_IO_str_init_static) (&f, dest,
- (s + maxsize) - dest, dest);
+ _IO_str_init_static_internal (&f, dest, (s + maxsize) - dest, dest);
/* We clear the last available byte so we can find out whether
the numeric representation is too long. */
s[maxsize - 1] = '\0';
diff --git a/sunrpc/openchild.c b/sunrpc/openchild.c
index 541a223..29f274a 100644
--- a/sunrpc/openchild.c
+++ b/sunrpc/openchild.c
@@ -42,8 +42,8 @@
#include <rpc/clnt.h>
#include <libio/iolibio.h>
-#define fflush(s) INTUSE(_IO_fflush) (s)
-#define __fdopen(fd,m) INTUSE(_IO_fdopen) (fd,m)
+#define fflush(s) _IO_fflush (s)
+#define __fdopen(fd,m) _IO_fdopen (fd,m)
/*
* returns pid, or -1 for failure
diff --git a/sunrpc/xdr_stdio.c b/sunrpc/xdr_stdio.c
index 667515e..faa646d 100644
--- a/sunrpc/xdr_stdio.c
+++ b/sunrpc/xdr_stdio.c
@@ -40,10 +40,10 @@
#include <rpc/xdr.h>
#include <libio/iolibio.h>
-#define fflush(s) INTUSE(_IO_fflush) (s)
-#define fread(p, m, n, s) INTUSE(_IO_fread) (p, m, n, s)
-#define ftell(s) INTUSE(_IO_ftell) (s)
-#define fwrite(p, m, n, s) INTUSE(_IO_fwrite) (p, m, n, s)
+#define fflush(s) _IO_fflush (s)
+#define fread(p, m, n, s) _IO_fread (p, m, n, s)
+#define ftell(s) _IO_ftell (s)
+#define fwrite(p, m, n, s) _IO_fwrite (p, m, n, s)
static bool_t xdrstdio_getlong (XDR *, long *);
static bool_t xdrstdio_putlong (XDR *, const long *);
diff --git a/sysdeps/ieee754/ldbl-opt/nldbl-compat.c b/sysdeps/ieee754/ldbl-opt/nldbl-compat.c
index 2de3ab5..18893b8 100644
--- a/sysdeps/ieee754/ldbl-opt/nldbl-compat.c
+++ b/sysdeps/ieee754/ldbl-opt/nldbl-compat.c
@@ -1,5 +1,5 @@
/* *printf* family compatibility routines for IEEE double as long double
- Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2006-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@cygnus.com>, 2006.
@@ -167,7 +167,7 @@ __nldbl_vfprintf (FILE *s, const char *fmt, va_list ap)
{
int done;
set_no_long_double ();
- done = INTUSE(_IO_vfprintf) (s, fmt, ap);
+ done = _IO_vfprintf (s, fmt, ap);
clear_no_long_double ();
return done;
}
@@ -180,7 +180,7 @@ __nldbl__IO_vsprintf (char *string, const char *fmt, va_list ap)
{
int done;
__no_long_double = 1;
- done = INTUSE(_IO_vsprintf) (string, fmt, ap);
+ done = _IO_vsprintf (string, fmt, ap);
__no_long_double = 0;
return done;
}
@@ -338,7 +338,7 @@ __nldbl__IO_vfscanf (FILE *s, const char *fmt, _IO_va_list ap,
{
int res;
set_no_long_double ();
- res = INTUSE(_IO_vfscanf) (s, fmt, ap, errp);
+ res = _IO_vfscanf (s, fmt, ap, errp);
clear_no_long_double ();
return res;
}
@@ -349,7 +349,7 @@ __nldbl___vfscanf (FILE *s, const char *fmt, va_list ap)
{
int res;
set_no_long_double ();
- res = INTUSE(_IO_vfscanf) (s, fmt, ap, NULL);
+ res = _IO_vfscanf (s, fmt, ap, NULL);
clear_no_long_double ();
return res;
}
diff --git a/sysdeps/mach/hurd/tmpfile.c b/sysdeps/mach/hurd/tmpfile.c
index 5b16d85..94b1380 100644
--- a/sysdeps/mach/hurd/tmpfile.c
+++ b/sysdeps/mach/hurd/tmpfile.c
@@ -1,5 +1,5 @@
/* Open a stdio stream on an anonymous temporary file. Hurd version.
- Copyright (C) 2001,2002,2003 Free Software Foundation, Inc.
+ Copyright (C) 2001-2012 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
@@ -56,7 +56,7 @@ __tmpfile (void)
/* Open a stream on the unnamed file.
It will cease to exist when this stream is closed. */
- if ((f = INTUSE(_IO_fdopen) (fd, "w+b")) == NULL)
+ if ((f = _IO_fdopen (fd, "w+b")) == NULL)
__close (fd);
return f;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 185 +++++++++++++++++++++++++++++++
argp/argp-help.c | 4 +-
argp/argp-parse.c | 4 +-
assert/assert.c | 5 +-
debug/fgets_chk.c | 5 +-
debug/fgets_u_chk.c | 5 +-
debug/fread_chk.c | 5 +-
debug/fread_u_chk.c | 6 +-
debug/gets_chk.c | 5 +-
debug/obprintf_chk.c | 5 +-
debug/vasprintf_chk.c | 5 +-
debug/vdprintf_chk.c | 11 +-
debug/vsnprintf_chk.c | 5 +-
debug/vsprintf_chk.c | 19 ++--
include/argz.h | 7 +-
include/libintl.h | 10 --
include/libio.h | 7 +
include/stdio.h | 7 +-
include/stdio_ext.h | 2 +-
intl/dcgettext.c | 3 +-
intl/dgettext.c | 4 +-
intl/gettext.c | 4 +-
intl/l10nflist.c | 11 +--
libio/__fpurge.c | 6 +-
libio/__fsetlocking.c | 4 +-
libio/filedoalloc.c | 4 +-
libio/fileops.c | 145 ++++++++++++-------------
libio/freopen.c | 4 +-
libio/freopen64.c | 4 +-
libio/genops.c | 85 +++++++-------
libio/iofclose.c | 6 +-
libio/iofdopen.c | 13 +-
libio/iofflush.c | 7 +-
libio/iofflush_u.c | 4 +-
libio/iofgets.c | 5 +-
libio/iofgets_u.c | 4 +-
libio/iofopen.c | 10 +-
libio/iofopncook.c | 49 ++++----
libio/iofread.c | 7 +-
libio/iofread_u.c | 4 +-
libio/ioftell.c | 5 +-
libio/iofwrite.c | 5 +-
libio/iogetline.c | 12 +-
libio/iogets.c | 4 +-
libio/iogetwline.c | 4 +-
libio/iolibio.h | 35 +++----
libio/iopadn.c | 4 +-
libio/iopopen.c | 21 ++--
libio/ioseekoff.c | 7 +-
libio/ioseekpos.c | 6 +-
libio/iosetbuffer.c | 5 +-
libio/iosetvbuf.c | 5 +-
libio/ioungetc.c | 4 +-
libio/ioungetwc.c | 5 +-
libio/iovdprintf.c | 11 +-
libio/iovsprintf.c | 6 +-
libio/iovsscanf.c | 4 +-
libio/libioP.h | 178 ++++++++++++------------------
libio/memstream.c | 22 ++--
libio/obprintf.c | 5 +-
libio/oldfileops.c | 52 ++++-----
libio/oldiofclose.c | 7 +-
libio/oldiofdopen.c | 5 +-
libio/oldiofopen.c | 5 +-
libio/oldiopopen.c | 18 ++--
libio/oldstdfiles.c | 4 +-
libio/putc.c | 5 +-
libio/setbuf.c | 4 +-
libio/setlinebuf.c | 4 +-
libio/stdfiles.c | 4 +-
libio/strops.c | 36 +++---
libio/vasprintf.c | 5 +-
libio/vscanf.c | 4 +-
libio/vsnprintf.c | 22 ++--
libio/vswprintf.c | 17 ++--
libio/wfiledoalloc.c | 7 +-
libio/wfileops.c | 110 +++++++++---------
libio/wgenops.c | 65 +++++------
libio/wmemstream.c | 10 +-
libio/wstrops.c | 20 ++--
malloc/mtrace.c | 4 +-
misc/error.c | 6 +-
misc/syslog.c | 2 +-
posix/regex_internal.h | 4 +-
stdio-common/asprintf.c | 5 +-
stdio-common/fxprintf.c | 4 +-
stdio-common/getw.c | 4 +-
stdio-common/isoc99_fscanf.c | 4 +-
stdio-common/isoc99_scanf.c | 5 +-
stdio-common/isoc99_vfscanf.c | 4 +-
stdio-common/isoc99_vscanf.c | 4 +-
stdio-common/isoc99_vsscanf.c | 4 +-
stdio-common/printf-prs.c | 5 +-
stdio-common/printf_fp.c | 4 +-
stdio-common/printf_fphex.c | 4 +-
stdio-common/printf_size.c | 4 +-
stdio-common/putw.c | 4 +-
stdio-common/scanf.c | 5 +-
stdio-common/sprintf.c | 5 +-
stdio-common/tmpfile.c | 5 +-
stdio-common/vfprintf.c | 31 +++---
stdio-common/vfscanf.c | 11 +-
stdlib/strfmon_l.c | 7 +-
string/argz-count.c | 4 +-
string/argz-stringify.c | 4 +-
sunrpc/openchild.c | 4 +-
sunrpc/xdr_stdio.c | 8 +-
sysdeps/ieee754/ldbl-opt/nldbl-compat.c | 10 +-
sysdeps/mach/hurd/tmpfile.c | 4 +-
109 files changed, 836 insertions(+), 770 deletions(-)
hooks/post-receive
--
GNU C Library master sources