mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-24 11:41:07 +00:00
698fb75b9f
There are a lot more printf variants than there are scanf variants,
and the code for setting up and tearing down their custom FILE
variants around the call to __vf(w)printf is more complicated and
variable. Therefore, I have added _internal versions of all the
v*printf variants, rather than introducing helper routines so that
they can all directly call __vf(w)printf_internal, as was done with
scanf.
As with the scanf changes, in this patch the _internal functions still
look at the environmental mode bits and all callers pass 0 for the
flags parameter.
Several of the affected public functions had _IO_ name aliases that
were not exported (but, in one case, appeared in libio.h anyway);
I was originally planning to leave them as aliases to avoid having
to touch internal callers, but it turns out ldbl_*_alias only work
for exported symbols, so they've all been removed instead. It also
turns out there were hardly any internal callers. _IO_vsprintf and
_IO_vfprintf *are* exported, so those two stick around.
Summary for the changes to each of the affected symbols:
_IO_vfprintf, _IO_vsprintf:
All internal calls removed, thus the internal declarations, as well
as uses of libc_hidden_proto and libc_hidden_def, were also removed.
The external symbol is now exposed via uses of ldbl_strong_alias
to __vfprintf_internal and __vsprintf_internal, respectively.
_IO_vasprintf, _IO_vdprintf, _IO_vsnprintf,
_IO_vfwprintf, _IO_vswprintf,
_IO_obstack_vprintf, _IO_obstack_printf:
All internal calls removed, thus declaration in internal headers
were also removed. They were never exported, so there are no
aliases tying them to the internal functions. I.e.: entirely gone.
__vsnprintf:
Internal calls were always preceded by macros such as
#define __vsnprintf _IO_vsnprintf, and
#define __vsnprintf vsnprintf
The macros were removed and their uses replaced with calls to the
new internal function __vsnprintf_internal. Since there were no
internal calls, the internal declaration was also removed. The
external symbol is preserved with ldbl_weak_alias to ___vsnprintf.
__vfwprintf:
All internal calls converted into calls to __vfwprintf_internal,
thus the internal declaration was removed. The function is now a
wrapper that calls __vfwprintf_internal. The external symbol is
preserved.
__vswprintf:
Similarly, but no external symbol.
__vasprintf, __vdprintf, __vfprintf, __vsprintf:
New internal wrappers. Not exported.
vasprintf, vdprintf, vfprintf, vsprintf, vsnprintf,
vfwprintf, vswprintf,
obstack_vprintf, obstack_printf:
These functions used to be aliases to the respective _IO_* function,
they are now aliases to their respective __* functions.
Tested for powerpc and powerpc64le.
85 lines
3.5 KiB
C
85 lines
3.5 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*);
|
|
libc_hidden_proto (_IO_puts)
|
|
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;
|
|
|
|
#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. */
|