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.
95 lines
3.9 KiB
C
95 lines
3.9 KiB
C
#ifndef _IOLIBIO_H
|
|
#define _IOLIBIO_H 1
|
|
|
|
#include <stdio.h>
|
|
#include <libio/libio.h>
|
|
|
|
/* Alternative names for many of the stdio.h functions, used
|
|
internally and exposed for backward compatibility's sake. */
|
|
|
|
extern int _IO_fclose (FILE*);
|
|
extern int _IO_new_fclose (FILE*);
|
|
extern int _IO_old_fclose (FILE*);
|
|
extern FILE *_IO_fdopen (int, const char*) __THROW;
|
|
libc_hidden_proto (_IO_fdopen)
|
|
extern FILE *_IO_old_fdopen (int, const char*) __THROW;
|
|
extern FILE *_IO_new_fdopen (int, const char*) __THROW;
|
|
extern int _IO_fflush (FILE*);
|
|
libc_hidden_proto (_IO_fflush)
|
|
extern int _IO_fgetpos (FILE*, __fpos_t*);
|
|
extern int _IO_fgetpos64 (FILE*, __fpos64_t*);
|
|
extern char* _IO_fgets (char*, int, FILE*);
|
|
extern FILE *_IO_fopen (const char*, const char*);
|
|
extern FILE *_IO_old_fopen (const char*, const char*);
|
|
extern FILE *_IO_new_fopen (const char*, const char*);
|
|
extern FILE *_IO_fopen64 (const char*, const char*);
|
|
extern FILE *__fopen_internal (const char*, const char*, int)
|
|
attribute_hidden;
|
|
extern FILE *__fopen_maybe_mmap (FILE *) __THROW attribute_hidden;
|
|
extern int _IO_fprintf (FILE*, const char*, ...);
|
|
extern int _IO_fputs (const char*, FILE*);
|
|
libc_hidden_proto (_IO_fputs)
|
|
extern int _IO_fsetpos (FILE*, const __fpos_t *);
|
|
extern int _IO_fsetpos64 (FILE*, const __fpos64_t *);
|
|
extern long int _IO_ftell (FILE*);
|
|
libc_hidden_proto (_IO_ftell)
|
|
extern size_t _IO_fread (void*, size_t, size_t, FILE*);
|
|
libc_hidden_proto (_IO_fread)
|
|
extern size_t _IO_fwrite (const void*, size_t, size_t, FILE*);
|
|
libc_hidden_proto (_IO_fwrite)
|
|
extern char* _IO_gets (char*);
|
|
extern void _IO_perror (const char*) __THROW;
|
|
extern int _IO_printf (const char*, ...);
|
|
extern int _IO_puts (const char*);
|
|
extern int _IO_scanf (const char*, ...);
|
|
extern void _IO_setbuffer (FILE *, char*, size_t) __THROW;
|
|
libc_hidden_proto (_IO_setbuffer)
|
|
extern int _IO_setvbuf (FILE*, char*, int, size_t) __THROW;
|
|
libc_hidden_proto (_IO_setvbuf)
|
|
extern int _IO_sscanf (const char*, const char*, ...) __THROW;
|
|
extern int _IO_sprintf (char *, const char*, ...) __THROW;
|
|
extern int _IO_ungetc (int, FILE*) __THROW;
|
|
extern int _IO_vsscanf (const char *, const char *, __gnuc_va_list) __THROW;
|
|
extern int _IO_vsprintf (char*, const char*, __gnuc_va_list) __THROW;
|
|
libc_hidden_proto (_IO_vsprintf)
|
|
extern int _IO_vswprintf (wchar_t*, size_t, const wchar_t*, __gnuc_va_list)
|
|
__THROW;
|
|
|
|
struct obstack;
|
|
extern int _IO_obstack_vprintf (struct obstack *, const char *, __gnuc_va_list)
|
|
__THROW;
|
|
extern int _IO_obstack_printf (struct obstack *, const char *, ...) __THROW;
|
|
#ifndef _IO_pos_BAD
|
|
#define _IO_pos_BAD ((off64_t)(-1))
|
|
#endif
|
|
#define _IO_clearerr(FP) ((FP)->_flags &= ~(_IO_ERR_SEEN|_IO_EOF_SEEN))
|
|
#define _IO_fseek(__fp, __offset, __whence) \
|
|
(_IO_seekoff_unlocked (__fp, __offset, __whence, _IOS_INPUT|_IOS_OUTPUT) \
|
|
== _IO_pos_BAD ? EOF : 0)
|
|
#define _IO_rewind(FILE) \
|
|
(void) _IO_seekoff_unlocked (FILE, 0, 0, _IOS_INPUT|_IOS_OUTPUT)
|
|
#define _IO_vprintf(FORMAT, ARGS) \
|
|
_IO_vfprintf (_IO_stdout, FORMAT, ARGS)
|
|
#define _IO_freopen(FILENAME, MODE, FP) \
|
|
(_IO_file_close_it (FP), \
|
|
_IO_file_fopen (FP, FILENAME, MODE, 1))
|
|
#define _IO_old_freopen(FILENAME, MODE, FP) \
|
|
(_IO_old_file_close_it (FP), _IO_old_file_fopen(FP, FILENAME, MODE))
|
|
#define _IO_freopen64(FILENAME, MODE, FP) \
|
|
(_IO_file_close_it (FP), \
|
|
_IO_file_fopen (FP, FILENAME, MODE, 0))
|
|
#define _IO_fileno(FP) ((FP)->_fileno)
|
|
extern FILE* _IO_popen (const char*, const char*) __THROW;
|
|
extern FILE* _IO_new_popen (const char*, const char*) __THROW;
|
|
extern FILE* _IO_old_popen (const char*, const char*) __THROW;
|
|
extern int __new_pclose (FILE *) __THROW;
|
|
extern int __old_pclose (FILE *) __THROW;
|
|
#define _IO_pclose _IO_fclose
|
|
#define _IO_setbuf(_FP, _BUF) _IO_setbuffer (_FP, _BUF, BUFSIZ)
|
|
#define _IO_setlinebuf(_FP) _IO_setvbuf (_FP, NULL, 1, 0)
|
|
|
|
FILE *__new_freopen (const char *, const char *, FILE *) __THROW;
|
|
FILE *__old_freopen (const char *, const char *, FILE *) __THROW;
|
|
|
|
#endif /* iolibio.h. */
|