mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 11:20:07 +00:00
6c6c962a20
We can't go very far with libio cleanups as long as we still have
_IO_MTSAFE_IO, and I am not tackling that in this patch series,
but we can at least make the maze of stdio-related headers a
little less complicated.
In this patch, libio.h moves back out of bits/ into the top level of
the libio subdirectory, and is merged with libio/bits/libio-ldbl.h
(which also used to be installed) and include/libio.h. Since almost
no files include libio.h directly, this is quite straightforward.
libio.h is now always used with _LIBC defined, so all of the _LIBC ||
_GLIBCPP_USE_WCHAR_T conditionals are unnecessary. Similarly, the
ifdef nest surrounding the definition of _IO_fwide_maybe_incompatible
can collapse down to a single SHLIB_COMPAT check. I also took the
opportunity to add some checks for configuration botches to libio.h.
Installed stripped libraries are unchanged by this patch.
* libio/bits/libio.h: Move back to libio/libio.h and adjust
multiple-include guard to match.
Merge contents of libio/bits/libio-ldbl.h and include/libio.h
into this file.
Remove preprocessor conditionals that are always true and/or
redundant to other preprocessor conditionals in the same nest.
Include shlib-compat.h unconditionally.
Error out if _LIBC is not defined, or if _ISOMAC is defined,
or if _IO_MTSAFE_IO is defined but _IO_lock_t_defined is not
defined after including stdio.h.
Use __BEGIN_DECLS/__END_DECLS.
* libio/bits/libio-ldbl.h, include/bits/libio.h: Delete file.
* include/stdio.h, libio/iolibio.h, libio/libioP.h: Include
libio.h as <libio/libio.h> rather than as <bits/libio.h>.
103 lines
4.1 KiB
C
103 lines
4.1 KiB
C
#ifndef _IOLIBIO_H
|
|
#define _IOLIBIO_H 1
|
|
|
|
#include <stdio.h>
|
|
#include <libio/libio.h>
|
|
|
|
/* These emulate stdio functionality, but with a different name
|
|
(_IO_ungetc instead of ungetc), and using _IO_FILE instead of FILE. */
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
extern int _IO_fclose (_IO_FILE*);
|
|
extern int _IO_new_fclose (_IO_FILE*);
|
|
extern int _IO_old_fclose (_IO_FILE*);
|
|
extern _IO_FILE *_IO_fdopen (int, const char*) __THROW;
|
|
libc_hidden_proto (_IO_fdopen)
|
|
extern _IO_FILE *_IO_old_fdopen (int, const char*) __THROW;
|
|
extern _IO_FILE *_IO_new_fdopen (int, const char*) __THROW;
|
|
extern int _IO_fflush (_IO_FILE*);
|
|
libc_hidden_proto (_IO_fflush)
|
|
extern int _IO_fgetpos (_IO_FILE*, _IO_fpos_t*);
|
|
extern int _IO_fgetpos64 (_IO_FILE*, _IO_fpos64_t*);
|
|
extern char* _IO_fgets (char*, int, _IO_FILE*);
|
|
extern _IO_FILE *_IO_fopen (const char*, const char*);
|
|
extern _IO_FILE *_IO_old_fopen (const char*, const char*);
|
|
extern _IO_FILE *_IO_new_fopen (const char*, const char*);
|
|
extern _IO_FILE *_IO_fopen64 (const char*, const char*);
|
|
extern _IO_FILE *__fopen_internal (const char*, const char*, int)
|
|
attribute_hidden;
|
|
extern _IO_FILE *__fopen_maybe_mmap (_IO_FILE *) __THROW attribute_hidden;
|
|
extern int _IO_fprintf (_IO_FILE*, const char*, ...);
|
|
extern int _IO_fputs (const char*, _IO_FILE*);
|
|
libc_hidden_proto (_IO_fputs)
|
|
extern int _IO_fsetpos (_IO_FILE*, const _IO_fpos_t *);
|
|
extern int _IO_fsetpos64 (_IO_FILE*, const _IO_fpos64_t *);
|
|
extern long int _IO_ftell (_IO_FILE*);
|
|
libc_hidden_proto (_IO_ftell)
|
|
extern _IO_size_t _IO_fread (void*, _IO_size_t, _IO_size_t, _IO_FILE*);
|
|
libc_hidden_proto (_IO_fread)
|
|
extern _IO_size_t _IO_fwrite (const void*, _IO_size_t, _IO_size_t, _IO_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 (_IO_FILE *, char*, _IO_size_t) __THROW;
|
|
libc_hidden_proto (_IO_setbuffer)
|
|
extern int _IO_setvbuf (_IO_FILE*, char*, int, _IO_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, _IO_FILE*) __THROW;
|
|
extern int _IO_vsscanf (const char *, const char *, _IO_va_list) __THROW;
|
|
extern int _IO_vsprintf (char*, const char*, _IO_va_list) __THROW;
|
|
libc_hidden_proto (_IO_vsprintf)
|
|
extern int _IO_vswprintf (wchar_t*, _IO_size_t, const wchar_t*, _IO_va_list)
|
|
__THROW;
|
|
|
|
struct obstack;
|
|
extern int _IO_obstack_vprintf (struct obstack *, const char *, _IO_va_list)
|
|
__THROW;
|
|
extern int _IO_obstack_printf (struct obstack *, const char *, ...) __THROW;
|
|
#ifndef _IO_pos_BAD
|
|
#define _IO_pos_BAD ((_IO_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 _IO_FILE* _IO_popen (const char*, const char*) __THROW;
|
|
extern _IO_FILE* _IO_new_popen (const char*, const char*) __THROW;
|
|
extern _IO_FILE* _IO_old_popen (const char*, const char*) __THROW;
|
|
extern int __new_pclose (_IO_FILE *) __THROW;
|
|
extern int __old_pclose (_IO_FILE *) __THROW;
|
|
#define _IO_pclose _IO_fclose
|
|
#define _IO_setbuf(_FP, _BUF) _IO_setbuffer (_FP, _BUF, _IO_BUFSIZ)
|
|
#define _IO_setlinebuf(_FP) _IO_setvbuf (_FP, NULL, 1, 0)
|
|
|
|
_IO_FILE *__new_freopen (const char *, const char *, _IO_FILE *) __THROW;
|
|
_IO_FILE *__old_freopen (const char *, const char *, _IO_FILE *) __THROW;
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* iolibio.h. */
|