summaryrefslogtreecommitdiff
path: root/stdio-common
diff options
context:
space:
mode:
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/fxprintf.c6
-rw-r--r--stdio-common/getline.c8
-rw-r--r--stdio-common/isoc99_vfscanf.c2
-rw-r--r--stdio-common/isoc99_vscanf.c2
-rw-r--r--stdio-common/isoc99_vsscanf.c2
-rw-r--r--stdio-common/printf_fp.c7
-rw-r--r--stdio-common/printf_fphex.c7
-rw-r--r--stdio-common/printf_size.c8
-rw-r--r--stdio-common/vfprintf.c26
-rw-r--r--stdio-common/vfscanf.c7
10 files changed, 25 insertions, 50 deletions
diff --git a/stdio-common/fxprintf.c b/stdio-common/fxprintf.c
index c1f02925fb..c4a1146b20 100644
--- a/stdio-common/fxprintf.c
+++ b/stdio-common/fxprintf.c
@@ -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;
diff --git a/stdio-common/getline.c b/stdio-common/getline.c
index a8b91ec62a..77f77c2400 100644
--- a/stdio-common/getline.c
+++ b/stdio-common/getline.c
@@ -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)
diff --git a/stdio-common/isoc99_vfscanf.c b/stdio-common/isoc99_vfscanf.c
index 5d4389abdb..b80e05f8db 100644
--- a/stdio-common/isoc99_vfscanf.c
+++ b/stdio-common/isoc99_vfscanf.c
@@ -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;
diff --git a/stdio-common/isoc99_vscanf.c b/stdio-common/isoc99_vscanf.c
index 8b2b8af0b5..0b747f85ba 100644
--- a/stdio-common/isoc99_vscanf.c
+++ b/stdio-common/isoc99_vscanf.c
@@ -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;
diff --git a/stdio-common/isoc99_vsscanf.c b/stdio-common/isoc99_vsscanf.c
index ead4e551be..ac85ef2d0d 100644
--- a/stdio-common/isoc99_vsscanf.c
+++ b/stdio-common/isoc99_vsscanf.c
@@ -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;
diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
index 97f643af24..66ab59bad2 100644
--- a/stdio-common/printf_fp.c
+++ b/stdio-common/printf_fp.c
@@ -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. */
diff --git a/stdio-common/printf_fphex.c b/stdio-common/printf_fphex.c
index 002a7e1fec..df3956316d 100644
--- a/stdio-common/printf_fphex.c
+++ b/stdio-common/printf_fphex.c
@@ -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. */
diff --git a/stdio-common/printf_size.c b/stdio-common/printf_size.c
index 520b6b1e9a..7e073c50d4 100644
--- a/stdio-common/printf_size.c
+++ b/stdio-common/printf_size.c
@@ -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. */
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index a2cab30685..27d3a2c1bf 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -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. */
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index 099dfeac9e..a519a57b8f 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -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
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-12 15:02:54 +0000