From 9964a14579e5eef925aaa82facc4980f627802fe Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Wed, 7 Feb 2018 18:42:04 -0500 Subject: 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. --- libio/iofopncook.c | 63 +++++++++++++++++++++--------------------------------- 1 file changed, 24 insertions(+), 39 deletions(-) (limited to 'libio/iofopncook.c') diff --git a/libio/iofopncook.c b/libio/iofopncook.c index b39b4c364f..43a87fe4be 100644 --- a/libio/iofopncook.c +++ b/libio/iofopncook.c @@ -29,18 +29,8 @@ #include #include -/* Prototyped for local functions. */ -static _IO_ssize_t _IO_cookie_read (_IO_FILE* fp, void* buf, - _IO_ssize_t size); -static _IO_ssize_t _IO_cookie_write (_IO_FILE* fp, - const void* buf, _IO_ssize_t size); -static _IO_off64_t _IO_cookie_seek (_IO_FILE *fp, _IO_off64_t offset, int dir); -static _IO_off64_t _IO_cookie_seekoff (_IO_FILE *fp, _IO_off64_t offset, - int dir, int mode); -static int _IO_cookie_close (_IO_FILE* fp); - -static _IO_ssize_t -_IO_cookie_read (_IO_FILE *fp, void *buf, _IO_ssize_t size) +static ssize_t +_IO_cookie_read (FILE *fp, void *buf, ssize_t size) { struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp; cookie_read_function_t *read_cb = cfile->__io_functions.read; @@ -54,8 +44,8 @@ _IO_cookie_read (_IO_FILE *fp, void *buf, _IO_ssize_t size) return read_cb (cfile->__cookie, buf, size); } -static _IO_ssize_t -_IO_cookie_write (_IO_FILE *fp, const void *buf, _IO_ssize_t size) +static ssize_t +_IO_cookie_write (FILE *fp, const void *buf, ssize_t size) { struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp; cookie_write_function_t *write_cb = cfile->__io_functions.write; @@ -69,15 +59,15 @@ _IO_cookie_write (_IO_FILE *fp, const void *buf, _IO_ssize_t size) return 0; } - _IO_ssize_t n = write_cb (cfile->__cookie, buf, size); + ssize_t n = write_cb (cfile->__cookie, buf, size); if (n < size) fp->_flags |= _IO_ERR_SEEN; return n; } -static _IO_off64_t -_IO_cookie_seek (_IO_FILE *fp, _IO_off64_t offset, int dir) +static off64_t +_IO_cookie_seek (FILE *fp, off64_t offset, int dir) { struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp; cookie_seek_function_t *seek_cb = cfile->__io_functions.seek; @@ -88,12 +78,12 @@ _IO_cookie_seek (_IO_FILE *fp, _IO_off64_t offset, int dir) return ((seek_cb == NULL || (seek_cb (cfile->__cookie, &offset, dir) == -1) - || offset == (_IO_off64_t) -1) + || offset == (off64_t) -1) ? _IO_pos_BAD : offset); } static int -_IO_cookie_close (_IO_FILE *fp) +_IO_cookie_close (FILE *fp) { struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp; cookie_close_function_t *close_cb = cfile->__io_functions.close; @@ -108,8 +98,8 @@ _IO_cookie_close (_IO_FILE *fp) } -static _IO_off64_t -_IO_cookie_seekoff (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode) +static off64_t +_IO_cookie_seekoff (FILE *fp, off64_t offset, int dir, int mode) { /* We must force the fileops code to always use seek to determine the position. */ @@ -145,8 +135,8 @@ static const struct _IO_jump_t _IO_cookie_jumps libio_vtable = { /* Copy the callbacks from SOURCE to *TARGET, with pointer mangling. */ static void -set_callbacks (_IO_cookie_io_functions_t *target, - _IO_cookie_io_functions_t source) +set_callbacks (cookie_io_functions_t *target, + cookie_io_functions_t source) { #ifdef PTR_MANGLE PTR_MANGLE (source.read); @@ -159,7 +149,7 @@ set_callbacks (_IO_cookie_io_functions_t *target, void _IO_cookie_init (struct _IO_cookie_file *cfile, int read_write, - void *cookie, _IO_cookie_io_functions_t io_functions) + void *cookie, cookie_io_functions_t io_functions) { _IO_init_internal (&cfile->__fp.file, 0); _IO_JUMPS (&cfile->__fp) = &_IO_cookie_jumps; @@ -181,9 +171,9 @@ _IO_cookie_init (struct _IO_cookie_file *cfile, int read_write, } -_IO_FILE * +FILE * _IO_fopencookie (void *cookie, const char *mode, - _IO_cookie_io_functions_t io_functions) + cookie_io_functions_t io_functions) { int read_write; struct locked_FILE @@ -221,25 +211,20 @@ _IO_fopencookie (void *cookie, const char *mode, _IO_cookie_init (&new_f->cfile, read_write, cookie, io_functions); - return (_IO_FILE *) &new_f->cfile.__fp; + return (FILE *) &new_f->cfile.__fp; } versioned_symbol (libc, _IO_fopencookie, fopencookie, GLIBC_2_2); #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) -static _IO_off64_t _IO_old_cookie_seek (_IO_FILE *fp, _IO_off64_t offset, - int dir); -_IO_FILE * _IO_old_fopencookie (void *cookie, const char *mode, - _IO_cookie_io_functions_t io_functions); - -static _IO_off64_t +static off64_t attribute_compat_text_section -_IO_old_cookie_seek (_IO_FILE *fp, _IO_off64_t offset, int dir) +_IO_old_cookie_seek (FILE *fp, off64_t offset, int dir) { struct _IO_cookie_file *cfile = (struct _IO_cookie_file *) fp; - int (*seek_cb) (_IO_FILE *, _IO_off_t, int) - = (int (*) (_IO_FILE *, _IO_off_t, int)) cfile->__io_functions.seek;; + int (*seek_cb) (FILE *, off_t, int) + = (int (*) (FILE *, off_t, int)) cfile->__io_functions.seek; #ifdef PTR_DEMANGLE PTR_DEMANGLE (seek_cb); #endif @@ -275,12 +260,12 @@ static const struct _IO_jump_t _IO_old_cookie_jumps libio_vtable = { JUMP_INIT(imbue, _IO_default_imbue), }; -_IO_FILE * +FILE * attribute_compat_text_section _IO_old_fopencookie (void *cookie, const char *mode, - _IO_cookie_io_functions_t io_functions) + cookie_io_functions_t io_functions) { - _IO_FILE *ret; + FILE *ret; ret = _IO_fopencookie (cookie, mode, io_functions); if (ret != NULL) -- cgit v1.2.3-65-gdbad