mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-21 20: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. |
||
|---|---|---|
| .. | ||
| hurd | ||
| alloc-fd.c | ||
| catch-exc.c | ||
| catch-signal.c | ||
| compat-20.c | ||
| ctty-input.c | ||
| ctty-output.c | ||
| Depend | ||
| dtable.c | ||
| exc2signal.c | ||
| faultexc.defs | ||
| fchroot.c | ||
| fcntl-internal.h | ||
| fd-close.c | ||
| fd-read.c | ||
| fd-write.c | ||
| fopenport.c | ||
| get-host.c | ||
| getdport.c | ||
| geteuids.c | ||
| getumask.c | ||
| hurd-raise.c | ||
| hurd.h | ||
| hurdauth.c | ||
| hurdchdir.c | ||
| hurdexec.c | ||
| hurdfault.c | ||
| hurdfault.h | ||
| hurdfchdir.c | ||
| hurdhost.h | ||
| hurdid.c | ||
| hurdinit.c | ||
| hurdioctl.c | ||
| hurdkill.c | ||
| hurdlookup.c | ||
| hurdmalloc.c | ||
| hurdmalloc.h | ||
| hurdmsg.c | ||
| hurdpid.c | ||
| hurdports.c | ||
| hurdprio.c | ||
| hurdrlimit.c | ||
| hurdselect.c | ||
| hurdsig.c | ||
| hurdsock.c | ||
| hurdsocket.h | ||
| hurdstartup.c | ||
| hurdstartup.h | ||
| intern-fd.c | ||
| intr-msg.c | ||
| intr-rpc.defs | ||
| intr-rpc.h | ||
| longjmp-ts.c | ||
| lookup-at.c | ||
| lookup-retry.c | ||
| Makefile | ||
| msgportdemux.c | ||
| new-fd.c | ||
| Notes | ||
| openport.c | ||
| path-lookup.c | ||
| pid2task.c | ||
| port2fd.c | ||
| port-cleanup.c | ||
| ports-get.c | ||
| ports-set.c | ||
| preempt-sig.c | ||
| privports.c | ||
| report-wait.c | ||
| set-host.c | ||
| setauth.c | ||
| seteuids.c | ||
| siginfo.c | ||
| sigunwind.c | ||
| stack_chk_fail_local.c | ||
| task2pid.c | ||
| thread-cancel.c | ||
| thread-self.c | ||
| trampoline.c | ||
| Versions | ||
| vpprintf.c | ||
| xattr.c | ||