clean up stdio_impl.h

this header evolved to facilitate the extremely lazy practice of
omitting explicit includes of the necessary headers in individual
stdio source files; not only was this sloppy, but it also increased
build time.

now, stdio_impl.h is only including the headers it needs for its own
use; any further headers needed by source files are included directly
where needed.
This commit is contained in:
Rich Felker
2012-11-08 16:39:41 -05:00
parent 1e717ea3d2
commit 835f9f950e
41 changed files with 93 additions and 19 deletions

View File

@ -4,6 +4,7 @@
#include <float.h>
#include <limits.h>
#include <errno.h>
#include <ctype.h>
#include "shgetc.h"
#include "floatscan.h"

View File

@ -1,5 +1,6 @@
#include <limits.h>
#include <errno.h>
#include <ctype.h>
#include "shgetc.h"
/* Lookup table for digit values. -1==255>=36 -> invalid */

View File

@ -2,23 +2,6 @@
#define _STDIO_IMPL_H
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
#include <stdarg.h>
#include <string.h>
#include <inttypes.h>
#include <wchar.h>
#include <unistd.h>
#include <fcntl.h>
#include <limits.h>
#include <errno.h>
#include <termios.h>
#include <sys/ioctl.h>
#include <ctype.h>
#include <sys/wait.h>
#include <math.h>
#include <float.h>
#include <sys/uio.h>
#include "syscall.h"
#include "libc.h"

View File

@ -1,4 +1,10 @@
#include "stdio_impl.h"
#include <stdlib.h>
#include <termios.h>
#include <sys/ioctl.h>
#include <fcntl.h>
#include <errno.h>
#include <string.h>
FILE *__fdopen(int fd, const char *mode)
{

View File

@ -1,4 +1,6 @@
#include "stdio_impl.h"
#include <fcntl.h>
#include <string.h>
FILE *__fopen_rb_ca(const char *filename, FILE *f, unsigned char *buf, size_t len)
{

View File

@ -1,4 +1,5 @@
#include "stdio_impl.h"
#include <sys/uio.h>
#include <pthread.h>
static void cleanup(void *p)

View File

@ -1,4 +1,5 @@
#include "stdio_impl.h"
#include <sys/uio.h>
#include <pthread.h>
static void cleanup(void *p)

View File

@ -1,4 +1,6 @@
#include "stdio_impl.h"
#include <termios.h>
#include <sys/ioctl.h>
size_t __stdout_write(FILE *f, const unsigned char *buf, size_t len)
{

View File

@ -1,4 +1,5 @@
#include "stdio_impl.h"
#include <string.h>
size_t __string_read(FILE *f, unsigned char *buf, size_t len)
{

View File

@ -1,4 +1,5 @@
#include "stdio_impl.h"
#include <string.h>
char *fgetln(FILE *f, size_t *plen)
{

View File

@ -1,4 +1,5 @@
#include "stdio_impl.h"
#include <string.h>
#define MIN(a,b) ((a)<(b) ? (a) : (b))

View File

@ -1,4 +1,6 @@
#include "stdio_impl.h"
#include <wchar.h>
#include <errno.h>
wint_t __fgetwc_unlocked(FILE *f)
{

View File

@ -1,4 +1,5 @@
#include "stdio_impl.h"
#include <wchar.h>
wint_t __fgetwc_unlocked(FILE *);

View File

@ -1,4 +1,7 @@
#include "stdio_impl.h"
#include <errno.h>
#include <string.h>
#include <inttypes.h>
struct cookie {
size_t pos, len, size;

View File

@ -1,4 +1,7 @@
#include "stdio_impl.h"
#include <fcntl.h>
#include <string.h>
#include <errno.h>
FILE *fopen(const char *restrict filename, const char *restrict mode)
{

View File

@ -1,4 +1,5 @@
#include "stdio_impl.h"
#include <string.h>
int fputs(const char *restrict s, FILE *restrict f)
{

View File

@ -1,4 +1,7 @@
#include "stdio_impl.h"
#include <wchar.h>
#include <limits.h>
#include <ctype.h>
wint_t __fputwc_unlocked(wchar_t c, FILE *f)
{

View File

@ -1,4 +1,5 @@
#include "stdio_impl.h"
#include <wchar.h>
int fputws(const wchar_t *restrict ws, FILE *restrict f)
{

View File

@ -1,4 +1,5 @@
#include "stdio_impl.h"
#include <string.h>
#define MIN(a,b) ((a)<(b) ? (a) : (b))

View File

@ -1,4 +1,5 @@
#include "stdio_impl.h"
#include <fcntl.h>
/* The basic idea of this implementation is to open a new FILE,
* hack the necessary parts of the new FILE into the old one, then

View File

@ -1,4 +1,6 @@
#include "stdio_impl.h"
#include <limits.h>
#include <errno.h>
off_t __ftello_unlocked(FILE *f)
{

View File

@ -1,4 +1,5 @@
#include "stdio_impl.h"
#include <string.h>
size_t __fwritex(const unsigned char *restrict s, size_t l, FILE *restrict f)
{

View File

@ -1,4 +1,7 @@
#include "stdio_impl.h"
#include <string.h>
#include <inttypes.h>
#include <errno.h>
#define MIN(a,b) ((a)<(b) ? (a) : (b))

View File

@ -1,4 +1,6 @@
#include "stdio_impl.h"
#include <limits.h>
#include <string.h>
char *gets(char *s)
{

View File

@ -1,4 +1,5 @@
#include "stdio_impl.h"
#include <wchar.h>
wint_t getwc(FILE *f)
{

View File

@ -1,4 +1,5 @@
#include "stdio_impl.h"
#include <wchar.h>
wint_t getwchar(void)
{

View File

@ -1,4 +1,7 @@
#include "stdio_impl.h"
#include <errno.h>
#include <limits.h>
#include <string.h>
struct cookie {
char **bufp;

View File

@ -1,4 +1,8 @@
#include "stdio_impl.h"
#include <wchar.h>
#include <errno.h>
#include <limits.h>
#include <string.h>
struct cookie {
wchar_t **bufp;

View File

@ -1,5 +1,6 @@
#include "stdio_impl.h"
#include "syscall.h"
#include <errno.h>
#include <unistd.h>
int pclose(FILE *f)
{

View File

@ -1,4 +1,5 @@
#include "stdio_impl.h"
#include <wchar.h>
wint_t putwc(wchar_t c, FILE *f)
{

View File

@ -1,4 +1,5 @@
#include "stdio_impl.h"
#include <wchar.h>
wint_t putwchar(wchar_t c)
{

View File

@ -1,4 +1,8 @@
#include "stdio_impl.h"
#include <wchar.h>
#include <limits.h>
#include <ctype.h>
#include <string.h>
wint_t ungetwc(wint_t c, FILE *f)
{

View File

@ -1,4 +1,13 @@
#include "stdio_impl.h"
#include <errno.h>
#include <ctype.h>
#include <limits.h>
#include <string.h>
#include <stdarg.h>
#include <wchar.h>
#include <inttypes.h>
#include <math.h>
#include <float.h>
/* Some useful macros */

View File

@ -1,4 +1,3 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include <ctype.h>
@ -9,6 +8,7 @@
#include <errno.h>
#include <math.h>
#include <float.h>
#include <inttypes.h>
#include "stdio_impl.h"
#include "shgetc.h"

View File

@ -1,4 +1,11 @@
#include "stdio_impl.h"
#include <errno.h>
#include <ctype.h>
#include <limits.h>
#include <string.h>
#include <stdarg.h>
#include <wchar.h>
#include <inttypes.h>
/* Convenient bit representation for modifier flags, which all fall
* within 31 codepoints of the space character. */

View File

@ -1,4 +1,8 @@
#include "stdio_impl.h"
#include <limits.h>
#include <string.h>
#include <errno.h>
#include <stdint.h>
static size_t sn_write(FILE *f, const unsigned char *s, size_t l)
{

View File

@ -1,4 +1,9 @@
#include "stdio_impl.h"
#include <limits.h>
#include <string.h>
#include <errno.h>
#include <stdint.h>
#include <wchar.h>
struct cookie {
wchar_t *ws;

View File

@ -1,4 +1,5 @@
#include "stdio_impl.h"
#include <wchar.h>
static size_t wstring_read(FILE *f, unsigned char *buf, size_t len)
{

View File

@ -1,6 +1,9 @@
#include "stdio_impl.h"
#include "intscan.h"
#include "shgetc.h"
#include <inttypes.h>
#include <limits.h>
#include <ctype.h>
static unsigned long long strtox(const char *s, char **p, int base, unsigned long long lim)
{

View File

@ -1,6 +1,7 @@
#include "shgetc.h"
#include "floatscan.h"
#include "stdio_impl.h"
#include <wctype.h>
/* This read function heavily cheats. It knows:
* (1) len will always be 1

View File

@ -1,6 +1,10 @@
#include "stdio_impl.h"
#include "intscan.h"
#include "shgetc.h"
#include <inttypes.h>
#include <limits.h>
#include <wctype.h>
#include <wchar.h>
/* This read function heavily cheats. It knows:
* (1) len will always be 1