]> git.ipfire.org Git - thirdparty/glibc.git/commit - stdio-common/isoc99_vsscanf.c
Mechanically remove _IO_ name aliases for types and constants.
authorZack Weinberg <zackw@panix.com>
Wed, 7 Feb 2018 23:42:04 +0000 (18:42 -0500)
committerZack Weinberg <zackw@panix.com>
Wed, 21 Feb 2018 19:11:05 +0000 (14:11 -0500)
commit9964a14579e5eef925aaa82facc4980f627802fe
tree10bab616fb792754708552ee49a3cd914f9c167e
parent349579047db0fb55a2835ca20dfd646a45b6ac27
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.
128 files changed:
ChangeLog
debug/fgets_chk.c
debug/fgets_u_chk.c
debug/fgetws_chk.c
debug/fgetws_u_chk.c
debug/gets_chk.c
debug/vasprintf_chk.c
debug/vsprintf_chk.c
debug/vswprintf_chk.c
hurd/fopenport.c
include/stdio.h
libio/feof.c
libio/feof_u.c
libio/ferror.c
libio/ferror_u.c
libio/filedoalloc.c
libio/fileno.c
libio/fileops.c
libio/fmemopen.c
libio/fputc.c
libio/fputc_u.c
libio/fputwc.c
libio/fputwc_u.c
libio/fseek.c
libio/fseeko.c
libio/fseeko64.c
libio/ftello.c
libio/ftello64.c
libio/fwide.c
libio/genops.c
libio/iofclose.c
libio/iofdopen.c
libio/iofflush.c
libio/iofflush_u.c
libio/iofgetpos.c
libio/iofgetpos64.c
libio/iofgets.c
libio/iofgets_u.c
libio/iofgetws.c
libio/iofgetws_u.c
libio/iofopen.c
libio/iofopen64.c
libio/iofopncook.c
libio/iofputs.c
libio/iofputs_u.c
libio/iofputws.c
libio/iofputws_u.c
libio/iofread.c
libio/iofread_u.c
libio/iofsetpos.c
libio/iofsetpos64.c
libio/ioftell.c
libio/iofwide.c
libio/iofwrite.c
libio/iofwrite_u.c
libio/iogetdelim.c
libio/iogetline.c
libio/iogets.c
libio/iogetwline.c
libio/iolibio.h
libio/iopadn.c
libio/iopopen.c
libio/ioputs.c
libio/ioseekoff.c
libio/ioseekpos.c
libio/iosetbuffer.c
libio/iosetvbuf.c
libio/ioungetc.c
libio/ioungetwc.c
libio/iovdprintf.c
libio/iovsprintf.c
libio/iovsscanf.c
libio/iovswscanf.c
libio/iowpadn.c
libio/libio.h
libio/libioP.h
libio/memstream.c
libio/obprintf.c
libio/oldfileops.c
libio/oldfmemopen.c
libio/oldiofclose.c
libio/oldiofdopen.c
libio/oldiofgetpos.c
libio/oldiofgetpos64.c
libio/oldiofopen.c
libio/oldiofsetpos.c
libio/oldiofsetpos64.c
libio/oldiopopen.c
libio/oldstdfiles.c
libio/peekc.c
libio/putc.c
libio/putc_u.c
libio/putwc.c
libio/putwc_u.c
libio/rewind.c
libio/setbuf.c
libio/setlinebuf.c
libio/stdio.c
libio/strfile.h
libio/strops.c
libio/vasprintf.c
libio/vscanf.c
libio/vsnprintf.c
libio/vswprintf.c
libio/vwscanf.c
libio/wfiledoalloc.c
libio/wfileops.c
libio/wgenops.c
libio/wmemstream.c
libio/wstrops.c
malloc/malloc.c
stdio-common/fxprintf.c
stdio-common/getline.c
stdio-common/isoc99_vfscanf.c
stdio-common/isoc99_vscanf.c
stdio-common/isoc99_vsscanf.c
stdio-common/printf_fp.c
stdio-common/printf_fphex.c
stdio-common/printf_size.c
stdio-common/vfprintf.c
stdio-common/vfscanf.c
sysdeps/generic/stdio-lock.h
sysdeps/ieee754/ldbl-opt/nldbl-compat.c
sysdeps/ieee754/ldbl-opt/nldbl-iovfscanf.c
sysdeps/nptl/stdio-lock.h
wcsmbs/isoc99_vfwscanf.c
wcsmbs/isoc99_vswscanf.c
wcsmbs/isoc99_vwscanf.c