mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-01 10:06:57 +03:00
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.
This commit is contained in:
Zack Weinberg
@ -87,12 +87,12 @@ __fxprintf_nocancel (FILE *fp, const char *fmt, ...)
|
||||
va_list ap;
|
||||
va_start (ap, fmt);
|
||||
_IO_flockfile (fp);
|
||||
int save_flags2 = ((_IO_FILE *)fp)->_flags2;
|
||||
((_IO_FILE *)fp)->_flags2 |= _IO_FLAGS2_NOTCANCEL;
|
||||
int save_flags2 = fp->_flags2;
|
||||
fp->_flags2 |= _IO_FLAGS2_NOTCANCEL;
|
||||
|
||||
int res = locked_vfxprintf (fp, fmt, ap);
|
||||
|
||||
((_IO_FILE *)fp)->_flags2 = save_flags2;
|
||||
fp->_flags2 = save_flags2;
|
||||
_IO_funlockfile (fp);
|
||||
va_end (ap);
|
||||
return res;
|
||||
|
||||
@ -17,19 +17,15 @@
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
#include "../libio/libioP.h"
|
||||
|
||||
#undef __getline
|
||||
|
||||
#include "../libio/libioP.h"
|
||||
#undef ssize_t
|
||||
#define ssize_t _IO_ssize_t
|
||||
#define __getdelim _IO_getdelim
|
||||
|
||||
/* Like getdelim, but always looks for a newline. */
|
||||
ssize_t
|
||||
__getline (char **lineptr, size_t *n, FILE *stream)
|
||||
{
|
||||
return __getdelim (lineptr, n, '\n', stream);
|
||||
return _IO_getdelim (lineptr, n, '\n', stream);
|
||||
}
|
||||
|
||||
weak_alias (__getline, getline)
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
/* Read formatted input from STREAM according to the format string FORMAT. */
|
||||
/* VARARGS2 */
|
||||
int
|
||||
__isoc99_vfscanf (FILE *stream, const char *format, _IO_va_list args)
|
||||
__isoc99_vfscanf (FILE *stream, const char *format, va_list args)
|
||||
{
|
||||
int done;
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
/* Read formatted input from STDIN according to the format string FORMAT. */
|
||||
/* VARARGS2 */
|
||||
int
|
||||
__isoc99_vscanf (const char *format, _IO_va_list args)
|
||||
__isoc99_vscanf (const char *format, va_list args)
|
||||
{
|
||||
int done;
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
#include "../libio/strfile.h"
|
||||
|
||||
int
|
||||
__isoc99_vsscanf (const char *string, const char *format, _IO_va_list args)
|
||||
__isoc99_vsscanf (const char *string, const char *format, va_list args)
|
||||
{
|
||||
int ret;
|
||||
_IO_strfile sf;
|
||||
|
||||
@ -56,17 +56,12 @@
|
||||
#endif
|
||||
#include <assert.h>
|
||||
|
||||
/* This defines make it possible to use the same code for GNU C library and
|
||||
the GNU I/O library. */
|
||||
#define PUT(f, s, n) _IO_sputn (f, s, n)
|
||||
#define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : _IO_padn (f, c, n))
|
||||
/* We use this file GNU C library and GNU I/O library. So make
|
||||
names equal. */
|
||||
#undef putc
|
||||
#define putc(c, f) (wide \
|
||||
? (int)_IO_putwc_unlocked (c, f) : _IO_putc_unlocked (c, f))
|
||||
#define size_t _IO_size_t
|
||||
#define FILE _IO_FILE
|
||||
|
||||
|
||||
/* Macros for doing the actual output. */
|
||||
|
||||
|
||||
@ -43,18 +43,13 @@
|
||||
/* #define NDEBUG 1*/ /* Undefine this for debugging assertions. */
|
||||
#include <assert.h>
|
||||
|
||||
/* This defines make it possible to use the same code for GNU C library and
|
||||
the GNU I/O library. */
|
||||
#include <libioP.h>
|
||||
#define PUT(f, s, n) _IO_sputn (f, s, n)
|
||||
#define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : _IO_padn (f, c, n))
|
||||
/* We use this file GNU C library and GNU I/O library. So make
|
||||
names equal. */
|
||||
#undef putc
|
||||
#define putc(c, f) (wide \
|
||||
? (int)_IO_putwc_unlocked (c, f) : _IO_putc_unlocked (c, f))
|
||||
#define size_t _IO_size_t
|
||||
#define FILE _IO_FILE
|
||||
|
||||
|
||||
/* Macros for doing the actual output. */
|
||||
|
||||
|
||||
@ -24,18 +24,12 @@
|
||||
#include <printf.h>
|
||||
#include <libioP.h>
|
||||
|
||||
|
||||
/* This defines make it possible to use the same code for GNU C library and
|
||||
the GNU I/O library. */
|
||||
#define PUT(f, s, n) _IO_sputn (f, s, n)
|
||||
#define PAD(f, c, n) (wide ? _IO_wpadn (f, c, n) : _IO_padn (f, c, n))
|
||||
/* We use this file GNU C library and GNU I/O library. So make
|
||||
names equal. */
|
||||
#undef putc
|
||||
#define putc(c, f) (wide \
|
||||
? (int)_IO_putwc_unlocked (c, f) : _IO_putc_unlocked (c, f))
|
||||
#define size_t _IO_size_t
|
||||
#define FILE _IO_FILE
|
||||
|
||||
|
||||
/* Macros for doing the actual output. */
|
||||
|
||||
|
||||
@ -92,7 +92,7 @@ typedef const char *THOUSANDS_SEP_T;
|
||||
do { \
|
||||
if (width > 0) \
|
||||
{ \
|
||||
_IO_ssize_t written = _IO_padn (s, (Padchar), width); \
|
||||
ssize_t written = _IO_padn (s, (Padchar), width); \
|
||||
if (__glibc_unlikely (written != width)) \
|
||||
{ \
|
||||
done = -1; \
|
||||
@ -122,7 +122,7 @@ typedef wchar_t THOUSANDS_SEP_T;
|
||||
do { \
|
||||
if (width > 0) \
|
||||
{ \
|
||||
_IO_ssize_t written = _IO_wpadn (s, (Padchar), width); \
|
||||
ssize_t written = _IO_wpadn (s, (Padchar), width); \
|
||||
if (__glibc_unlikely (written != width)) \
|
||||
{ \
|
||||
done = -1; \
|
||||
@ -1218,7 +1218,7 @@ static int buffered_vfprintf (FILE *stream, const CHAR_T *fmt, va_list)
|
||||
__THROW __attribute__ ((noinline));
|
||||
|
||||
/* Handle positional format specifiers. */
|
||||
static int printf_positional (_IO_FILE *s,
|
||||
static int printf_positional (FILE *s,
|
||||
const CHAR_T *format, int readonly_format,
|
||||
va_list ap, va_list *ap_savep, int done,
|
||||
int nspecs_done, const UCHAR_T *lead_str_end,
|
||||
@ -1695,7 +1695,7 @@ do_positional:
|
||||
}
|
||||
|
||||
static int
|
||||
printf_positional (_IO_FILE *s, const CHAR_T *format, int readonly_format,
|
||||
printf_positional (FILE *s, const CHAR_T *format, int readonly_format,
|
||||
va_list ap, va_list *ap_savep, int done, int nspecs_done,
|
||||
const UCHAR_T *lead_str_end,
|
||||
CHAR_T *work_buffer, int save_errno,
|
||||
@ -2201,22 +2201,21 @@ struct helper_file
|
||||
#ifdef COMPILE_WPRINTF
|
||||
struct _IO_wide_data _wide_data;
|
||||
#endif
|
||||
_IO_FILE *_put_stream;
|
||||
FILE *_put_stream;
|
||||
#ifdef _IO_MTSAFE_IO
|
||||
_IO_lock_t lock;
|
||||
#endif
|
||||
};
|
||||
|
||||
static int
|
||||
_IO_helper_overflow (_IO_FILE *s, int c)
|
||||
_IO_helper_overflow (FILE *s, int c)
|
||||
{
|
||||
_IO_FILE *target = ((struct helper_file*) s)->_put_stream;
|
||||
FILE *target = ((struct helper_file*) s)->_put_stream;
|
||||
#ifdef COMPILE_WPRINTF
|
||||
int used = s->_wide_data->_IO_write_ptr - s->_wide_data->_IO_write_base;
|
||||
if (used)
|
||||
{
|
||||
_IO_size_t written = _IO_sputn (target, s->_wide_data->_IO_write_base,
|
||||
used);
|
||||
size_t written = _IO_sputn (target, s->_wide_data->_IO_write_base, used);
|
||||
if (written == 0 || written == WEOF)
|
||||
return WEOF;
|
||||
__wmemmove (s->_wide_data->_IO_write_base,
|
||||
@ -2228,7 +2227,7 @@ _IO_helper_overflow (_IO_FILE *s, int c)
|
||||
int used = s->_IO_write_ptr - s->_IO_write_base;
|
||||
if (used)
|
||||
{
|
||||
_IO_size_t written = _IO_sputn (target, s->_IO_write_base, used);
|
||||
size_t written = _IO_sputn (target, s->_IO_write_base, used);
|
||||
if (written == 0 || written == EOF)
|
||||
return EOF;
|
||||
memmove (s->_IO_write_base, s->_IO_write_base + written,
|
||||
@ -2286,12 +2285,11 @@ static const struct _IO_jump_t _IO_helper_jumps libio_vtable =
|
||||
#endif
|
||||
|
||||
static int
|
||||
buffered_vfprintf (_IO_FILE *s, const CHAR_T *format,
|
||||
_IO_va_list args)
|
||||
buffered_vfprintf (FILE *s, const CHAR_T *format, va_list args)
|
||||
{
|
||||
CHAR_T buf[_IO_BUFSIZ];
|
||||
CHAR_T buf[BUFSIZ];
|
||||
struct helper_file helper;
|
||||
_IO_FILE *hp = (_IO_FILE *) &helper._f;
|
||||
FILE *hp = (FILE *) &helper._f;
|
||||
int result, to_flush;
|
||||
|
||||
/* Orient the stream. */
|
||||
|
||||
@ -73,9 +73,6 @@
|
||||
#include <locale/localeinfo.h>
|
||||
#include <libioP.h>
|
||||
|
||||
#undef va_list
|
||||
#define va_list _IO_va_list
|
||||
|
||||
#ifdef COMPILE_WSCANF
|
||||
# define ungetc(c, s) ((void) (c == WEOF \
|
||||
|| (--read_in, \
|
||||
@ -270,11 +267,11 @@ char_buffer_add (struct char_buffer *buffer, CHAR_T ch)
|
||||
Return the number of assignments made, or -1 for an input error. */
|
||||
#ifdef COMPILE_WSCANF
|
||||
int
|
||||
_IO_vfwscanf (_IO_FILE *s, const wchar_t *format, _IO_va_list argptr,
|
||||
_IO_vfwscanf (FILE *s, const wchar_t *format, va_list argptr,
|
||||
int *errp)
|
||||
#else
|
||||
int
|
||||
_IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
|
||||
_IO_vfscanf_internal (FILE *s, const char *format, va_list argptr,
|
||||
int *errp)
|
||||
#endif
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user