mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-25 22:40:05 +00:00
9964a14579
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. |
||
|---|---|---|
| .. | ||
| alloc_buffer_alloc_array.c | ||
| alloc_buffer_allocate.c | ||
| alloc_buffer_copy_bytes.c | ||
| alloc_buffer_copy_string.c | ||
| alloc_buffer_create_failure.c | ||
| arena.c | ||
| Depend | ||
| dynarray_at_failure.c | ||
| dynarray_emplace_enlarge.c | ||
| dynarray_finalize.c | ||
| dynarray_resize_clear.c | ||
| dynarray_resize.c | ||
| dynarray-skeleton.c | ||
| dynarray.h | ||
| hooks.c | ||
| Makefile | ||
| malloc-hooks.h | ||
| malloc-internal.h | ||
| malloc.c | ||
| malloc.h | ||
| mallocbug.c | ||
| mcheck-init.c | ||
| mcheck.c | ||
| mcheck.h | ||
| memusage.c | ||
| memusage.sh | ||
| memusagestat.c | ||
| morecore.c | ||
| mtrace.c | ||
| mtrace.pl | ||
| obstack.c | ||
| obstack.h | ||
| reallocarray.c | ||
| scratch_buffer_grow_preserve.c | ||
| scratch_buffer_grow.c | ||
| scratch_buffer_set_array_size.c | ||
| set-freeres.c | ||
| thread-freeres.c | ||
| tst-alloc_buffer.c | ||
| tst-calloc.c | ||
| tst-dynarray-at-fail.c | ||
| tst-dynarray-fail.c | ||
| tst-dynarray-shared.h | ||
| tst-dynarray.c | ||
| tst-interpose-aux-nothread.c | ||
| tst-interpose-aux-thread.c | ||
| tst-interpose-aux.c | ||
| tst-interpose-aux.h | ||
| tst-interpose-nothread.c | ||
| tst-interpose-skeleton.c | ||
| tst-interpose-static-nothread.c | ||
| tst-interpose-static-thread.c | ||
| tst-interpose-thread.c | ||
| tst-malloc_info.c | ||
| tst-malloc-backtrace.c | ||
| tst-malloc-fork-deadlock.c | ||
| tst-malloc-stats-cancellation.c | ||
| tst-malloc-tcache-leak.c | ||
| tst-malloc-thread-exit.c | ||
| tst-malloc-thread-fail.c | ||
| tst-malloc-too-large.c | ||
| tst-malloc-usable-static-tunables.c | ||
| tst-malloc-usable-static.c | ||
| tst-malloc-usable-tunables.c | ||
| tst-malloc-usable.c | ||
| tst-malloc.c | ||
| tst-mallocfork2.c | ||
| tst-mallocfork.c | ||
| tst-mallocstate.c | ||
| tst-mallopt.c | ||
| tst-mcheck.c | ||
| tst-memalign.c | ||
| tst-mtrace.c | ||
| tst-mtrace.sh | ||
| tst-obstack.c | ||
| tst-posix_memalign.c | ||
| tst-pvalloc.c | ||
| tst-realloc.c | ||
| tst-reallocarray.c | ||
| tst-scratch_buffer.c | ||
| tst-trim1.c | ||
| tst-valloc.c | ||
| Versions | ||