aboutsummaryrefslogtreecommitdiff
path: root/debug
diff options
context:
space:
mode:
authorZack Weinberg <zackw@panix.com>2018-02-07 18:42:04 -0500
committerZack Weinberg <zackw@panix.com>2018-02-21 14:11:05 -0500
commit9964a14579e5eef925aaa82facc4980f627802fe (patch)
tree10bab616fb792754708552ee49a3cd914f9c167e /debug
parent349579047db0fb55a2835ca20dfd646a45b6ac27 (diff)
downloadglibc-9964a14579e5eef925aaa82facc4980f627802fe.zip
glibc-9964a14579e5eef925aaa82facc4980f627802fe.tar.gz
glibc-9964a14579e5eef925aaa82facc4980f627802fe.tar.bz2
Mechanically remove _IO_ name aliases for types and constants.
This patch mechanically removes all remaining uses, and the definitions, of the following libio name aliases: name replaced with ---- ------------- _IO_FILE FILE _IO_fpos_t __fpos_t _IO_fpos64_t __fpos64_t _IO_size_t size_t _IO_ssize_t ssize_t or __ssize_t _IO_off_t off_t _IO_off64_t off64_t _IO_pid_t pid_t _IO_uid_t uid_t _IO_wint_t wint_t _IO_va_list va_list or __gnuc_va_list _IO_BUFSIZ BUFSIZ _IO_cookie_io_functions_t cookie_io_functions_t __io_read_fn cookie_read_function_t __io_write_fn cookie_write_function_t __io_seek_fn cookie_seek_function_t __io_close_fn cookie_close_function_t I used __fpos_t and __fpos64_t instead of fpos_t and fpos64_t because the definitions of fpos_t and fpos64_t depend on the largefile mode. I used __ssize_t and __gnuc_va_list in a handful of headers where namespace cleanliness might be relevant even though they're internal-use-only. In all other cases, I used the public-namespace name. There are a tiny handful of places where I left a use of 'struct _IO_FILE' alone, because it was being used together with 'struct _IO_FILE_plus' or 'struct _IO_FILE_complete' in the same arithmetic expression. Because this patch was almost entirely done with search and replace, I may have introduced indentation botches. I did proofread the diff, but I may have missed something. The ChangeLog below calls out all of the places where this was not a pure search-and-replace change. Installed stripped libraries and executables are unchanged by this patch, except that some assertions in vfscanf.c change line numbers. * libio/libio.h (_IO_FILE): Delete; all uses changed to FILE. (_IO_fpos_t): Delete; all uses changed to __fpos_t. (_IO_fpos64_t): Delete; all uses changed to __fpos64_t. (_IO_size_t): Delete; all uses changed to size_t. (_IO_ssize_t): Delete; all uses changed to ssize_t or __ssize_t. (_IO_off_t): Delete; all uses changed to off_t. (_IO_off64_t): Delete; all uses changed to off64_t. (_IO_pid_t): Delete; all uses changed to pid_t. (_IO_uid_t): Delete; all uses changed to uid_t. (_IO_wint_t): Delete; all uses changed to wint_t. (_IO_va_list): Delete; all uses changed to va_list or __gnuc_va_list. (_IO_BUFSIZ): Delete; all uses changed to BUFSIZ. (_IO_cookie_io_functions_t): Delete; all uses changed to cookie_io_functions_t. (__io_read_fn): Delete; all uses changed to cookie_read_function_t. (__io_write_fn): Delete; all uses changed to cookie_write_function_t. (__io_seek_fn): Delete; all uses changed to cookie_seek_function_t. (__io_close_fn): Delete: all uses changed to cookie_close_function_t. * libio/iofopncook.c: Remove unnecessary forward declarations. * libio/iolibio.h: Correct outdated commentary. * malloc/malloc.c (__malloc_stats): Remove unnecessary casts. * stdio-common/fxprintf.c (__fxprintf_nocancel): Remove unnecessary casts. * stdio-common/getline.c: Use _IO_getdelim directly. Don't redefine ssize_t. * stdio-common/printf_fp.c, stdio_common/printf_fphex.c * stdio-common/printf_size.c: Don't redefine size_t or FILE. Remove outdated comments. * stdio-common/vfscanf.c: Don't redefine va_list.
Diffstat (limited to 'debug')
-rw-r--r--debug/fgets_chk.c4
-rw-r--r--debug/fgets_u_chk.c4
-rw-r--r--debug/fgetws_chk.c4
-rw-r--r--debug/fgetws_u_chk.c4
-rw-r--r--debug/gets_chk.c2
-rw-r--r--debug/vasprintf_chk.c6
-rw-r--r--debug/vsprintf_chk.c4
-rw-r--r--debug/vswprintf_chk.c2
8 files changed, 15 insertions, 15 deletions
diff --git a/debug/fgets_chk.c b/debug/fgets_chk.c
index 024c5cc..f223653 100644
--- a/debug/fgets_chk.c
+++ b/debug/fgets_chk.c
@@ -29,9 +29,9 @@
#include <sys/param.h>
char *
-__fgets_chk (char *buf, size_t size, int n, _IO_FILE *fp)
+__fgets_chk (char *buf, size_t size, int n, FILE *fp)
{
- _IO_size_t count;
+ size_t count;
char *result;
CHECK_FILE (fp, NULL);
if (n <= 0)
diff --git a/debug/fgets_u_chk.c b/debug/fgets_u_chk.c
index 668fdc8..317ae56 100644
--- a/debug/fgets_u_chk.c
+++ b/debug/fgets_u_chk.c
@@ -29,9 +29,9 @@
#include <sys/param.h>
char *
-__fgets_unlocked_chk (char *buf, size_t size, int n, _IO_FILE *fp)
+__fgets_unlocked_chk (char *buf, size_t size, int n, FILE *fp)
{
- _IO_size_t count;
+ size_t count;
char *result;
CHECK_FILE (fp, NULL);
if (n <= 0)
diff --git a/debug/fgetws_chk.c b/debug/fgetws_chk.c
index 4693a0b..8ea6635 100644
--- a/debug/fgetws_chk.c
+++ b/debug/fgetws_chk.c
@@ -20,9 +20,9 @@
#include <sys/param.h>
wchar_t *
-__fgetws_chk (wchar_t *buf, size_t size, int n, _IO_FILE *fp)
+__fgetws_chk (wchar_t *buf, size_t size, int n, FILE *fp)
{
- _IO_size_t count;
+ size_t count;
wchar_t *result;
int old_error;
CHECK_FILE (fp, NULL);
diff --git a/debug/fgetws_u_chk.c b/debug/fgetws_u_chk.c
index 36627d7..42dad6b 100644
--- a/debug/fgetws_u_chk.c
+++ b/debug/fgetws_u_chk.c
@@ -29,9 +29,9 @@
#include <sys/param.h>
wchar_t *
-__fgetws_unlocked_chk (wchar_t *buf, size_t size, int n, _IO_FILE *fp)
+__fgetws_unlocked_chk (wchar_t *buf, size_t size, int n, FILE *fp)
{
- _IO_size_t count;
+ size_t count;
wchar_t *result;
int old_error;
CHECK_FILE (fp, NULL);
diff --git a/debug/gets_chk.c b/debug/gets_chk.c
index 6c10d68..df3f947 100644
--- a/debug/gets_chk.c
+++ b/debug/gets_chk.c
@@ -30,7 +30,7 @@
char *
__gets_chk (char *buf, size_t size)
{
- _IO_size_t count;
+ size_t count;
int ch;
char *retval;
diff --git a/debug/vasprintf_chk.c b/debug/vasprintf_chk.c
index a00ef77..46603d9 100644
--- a/debug/vasprintf_chk.c
+++ b/debug/vasprintf_chk.c
@@ -37,12 +37,12 @@ __vasprintf_chk (char **result_ptr, int flags, const char *format,
{
/* Initial size of the buffer to be used. Will be doubled each time an
overflow occurs. */
- const _IO_size_t init_string_size = 100;
+ const size_t init_string_size = 100;
char *string;
_IO_strfile sf;
int ret;
- _IO_size_t needed;
- _IO_size_t allocated;
+ size_t needed;
+ size_t allocated;
/* No need to clear the memory here (unlike for open_memstream) since
we know we will never seek on the stream. */
string = (char *) malloc (init_string_size);
diff --git a/debug/vsprintf_chk.c b/debug/vsprintf_chk.c
index aa9571d..9a443bb 100644
--- a/debug/vsprintf_chk.c
+++ b/debug/vsprintf_chk.c
@@ -21,10 +21,10 @@
#include "../libio/strfile.h"
-static int _IO_str_chk_overflow (_IO_FILE *fp, int c) __THROW;
+static int _IO_str_chk_overflow (FILE *fp, int c) __THROW;
static int
-_IO_str_chk_overflow (_IO_FILE *fp, int c)
+_IO_str_chk_overflow (FILE *fp, int c)
{
/* When we come to here this means the user supplied buffer is
filled. */
diff --git a/debug/vswprintf_chk.c b/debug/vswprintf_chk.c
index 8169557..c6a7edc 100644
--- a/debug/vswprintf_chk.c
+++ b/debug/vswprintf_chk.c
@@ -59,7 +59,7 @@ __vswprintf_chk (wchar_t *s, size_t maxlen, int flags, size_t slen,
sf.f._sbf._f._flags2 |= _IO_FLAGS2_FORTIFY;
_IO_wstr_init_static (&sf.f._sbf._f, s, maxlen - 1, s);
- ret = _IO_vfwprintf ((_IO_FILE *) &sf.f._sbf, format, args);
+ ret = _IO_vfwprintf ((FILE *) &sf.f._sbf, format, args);
if (sf.f._sbf._f._wide_data->_IO_buf_base == sf.overflow_buf)
/* ISO C99 requires swprintf/vswprintf to return an error if the