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.

diff --git a/src/internal/floatscan.c b/src/internal/floatscan.c
index 082512130264c7375daafb58589cd3def53754bf..f6e331d45d52d95f0b6ea8358658da9c6b29d595 100644 (file)
--- a/src/internal/floatscan.c
+++ b/src/internal/floatscan.c
@@ -4,6 +4,7 @@
 #include <float.h>
 #include <limits.h>
 #include <errno.h>
+#include <ctype.h>
 
 #include "shgetc.h"
 #include "floatscan.h"

diff --git a/src/internal/intscan.c b/src/internal/intscan.c
index 178cdf0dcec056d11d47803040e7af9d74fa03b5..69350efa6380ed65577cdcad84f7d470cd234b3c 100644 (file)
--- a/src/internal/intscan.c
+++ b/src/internal/intscan.c
@@ -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 */

diff --git a/src/internal/stdio_impl.h b/src/internal/stdio_impl.h
index e9045f27ac02b05b648ffbca659c968d8f06ef1d..c9d20fac103c8a91f89ae3ff47518134090ec270 100644 (file)
--- a/src/internal/stdio_impl.h
+++ b/src/internal/stdio_impl.h
@@ -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"
 

diff --git a/src/stdio/__fdopen.c b/src/stdio/__fdopen.c
index df6ed71d484d49b32a871338675bd0013807979b..59690f6dcb97d3153df9541ccf15421759ba1f6b 100644 (file)
--- a/src/stdio/__fdopen.c
+++ b/src/stdio/__fdopen.c
@@ -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)
 {

diff --git a/src/stdio/__fopen_rb_ca.c b/src/stdio/__fopen_rb_ca.c
index a1b1b3b6ece7fb93d1f1d50606dca216dc54eb10..9202c8ce5c1423b33bdfc571cd93d16db2d4af5b 100644 (file)
--- a/src/stdio/__fopen_rb_ca.c
+++ b/src/stdio/__fopen_rb_ca.c
@@ -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)
 {

diff --git a/src/stdio/__stdio_read.c b/src/stdio/__stdio_read.c
index c99ca9a913314bdb15c221943327a39e50dc2a75..05e56f923a8aef884a9a36bec983df605afabe32 100644 (file)
--- a/src/stdio/__stdio_read.c
+++ b/src/stdio/__stdio_read.c
@@ -1,4 +1,5 @@
 #include "stdio_impl.h"
+#include <sys/uio.h>
 #include <pthread.h>
 
 static void cleanup(void *p)

diff --git a/src/stdio/__stdio_write.c b/src/stdio/__stdio_write.c
index cef7bbdc37238cbc8607a0e09e68f1551567d1e5..e52e91ae0f5e0dddc40ca98137fc17fe2c99c15d 100644 (file)
--- a/src/stdio/__stdio_write.c
+++ b/src/stdio/__stdio_write.c
@@ -1,4 +1,5 @@
 #include "stdio_impl.h"
+#include <sys/uio.h>
 #include <pthread.h>
 
 static void cleanup(void *p)

diff --git a/src/stdio/__stdout_write.c b/src/stdio/__stdout_write.c
index 0cf7123606ec1f69c563df4f05e19647ac02e87b..200fe2c96f5296446b464b3a91385ad497aa4a82 100644 (file)
--- a/src/stdio/__stdout_write.c
+++ b/src/stdio/__stdout_write.c
@@ -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)
 {

diff --git a/src/stdio/__string_read.c b/src/stdio/__string_read.c
index de002fc19ba49beed1b3962379ed1c5b69116e9e..7b50a7e1154224a40ddcbb204a429eb74380ffc9 100644 (file)
--- a/src/stdio/__string_read.c
+++ b/src/stdio/__string_read.c
@@ -1,4 +1,5 @@
 #include "stdio_impl.h"
+#include <string.h>
 
 size_t __string_read(FILE *f, unsigned char *buf, size_t len)
 {

diff --git a/src/stdio/fgetln.c b/src/stdio/fgetln.c
index 06b8883756e4356f3a0cb96c8d412c9db58b031c..a2e4bd3cc5bf1c1e9aa2bc927b88cdc02c02fba5 100644 (file)
--- a/src/stdio/fgetln.c
+++ b/src/stdio/fgetln.c
@@ -1,4 +1,5 @@
 #include "stdio_impl.h"
+#include <string.h>
 
 char *fgetln(FILE *f, size_t *plen)
 {

diff --git a/src/stdio/fgets.c b/src/stdio/fgets.c
index ee0ac30e83bc40a914859fbb770526590a27bfac..b01a4187037d81e6457e473c4e682e24787c9021 100644 (file)
--- a/src/stdio/fgets.c
+++ b/src/stdio/fgets.c
@@ -1,4 +1,5 @@
 #include "stdio_impl.h"
+#include <string.h>
 
 #define MIN(a,b) ((a)<(b) ? (a) : (b))
 

diff --git a/src/stdio/fgetwc.c b/src/stdio/fgetwc.c
index 6f9f9ec21f8351cecf5131db636f8600364e8fab..8626d54caa5dba9a5513da8ffaf180652443bf12 100644 (file)
--- a/src/stdio/fgetwc.c
+++ b/src/stdio/fgetwc.c
@@ -1,4 +1,6 @@
 #include "stdio_impl.h"
+#include <wchar.h>
+#include <errno.h>
 
 wint_t __fgetwc_unlocked(FILE *f)
 {

diff --git a/src/stdio/fgetws.c b/src/stdio/fgetws.c
index fab9bd0f131b5f09cb61f3c0c81dc636b48853c6..195cb4355a14b10b05b0b50cf293456b5b7b4f75 100644 (file)
--- a/src/stdio/fgetws.c
+++ b/src/stdio/fgetws.c
@@ -1,4 +1,5 @@
 #include "stdio_impl.h"
+#include <wchar.h>
 
 wint_t __fgetwc_unlocked(FILE *);
 

diff --git a/src/stdio/fmemopen.c b/src/stdio/fmemopen.c
index 770fd9953a63274cea74a24a4b1a7dd391c33824..91d52bc1d50a1e12402b8aaacc861357fcb92bcc 100644 (file)
--- a/src/stdio/fmemopen.c
+++ b/src/stdio/fmemopen.c
@@ -1,4 +1,7 @@
 #include "stdio_impl.h"
+#include <errno.h>
+#include <string.h>
+#include <inttypes.h>
 
 struct cookie {
        size_t pos, len, size;

diff --git a/src/stdio/fopen.c b/src/stdio/fopen.c
index c741aede152d55e076fb564ba6320a6918d65e5d..da17ce8b48dc431d6aa70539bbb136841e8f727d 100644 (file)
--- a/src/stdio/fopen.c
+++ b/src/stdio/fopen.c
@@ -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)
 {

diff --git a/src/stdio/fputs.c b/src/stdio/fputs.c
index b41bc8c7c97f157353b55c31d0ea3176bf551f48..1112b192c06b49528862fec0168f5af2527d1886 100644 (file)
--- a/src/stdio/fputs.c
+++ b/src/stdio/fputs.c
@@ -1,4 +1,5 @@
 #include "stdio_impl.h"
+#include <string.h>
 
 int fputs(const char *restrict s, FILE *restrict f)
 {

diff --git a/src/stdio/fputwc.c b/src/stdio/fputwc.c
index 45ea8c23ac2bc5cb43fea7a0ad4c33ba80c94412..7b621dd2ff9a868cd08e3beeeff3f53887dc89d7 100644 (file)
--- a/src/stdio/fputwc.c
+++ b/src/stdio/fputwc.c
@@ -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)
 {

diff --git a/src/stdio/fputws.c b/src/stdio/fputws.c
index 0b593c08d1d50d28d0c5832323402de72ec0c42f..5723cbcd7a573a2879f25339be378dc817388025 100644 (file)
--- a/src/stdio/fputws.c
+++ b/src/stdio/fputws.c
@@ -1,4 +1,5 @@
 #include "stdio_impl.h"
+#include <wchar.h>
 
 int fputws(const wchar_t *restrict ws, FILE *restrict f)
 {

diff --git a/src/stdio/fread.c b/src/stdio/fread.c
index 3f31af8a28f15a129edf4697e256e67d1a026aa5..c461256c3b0de4d6af84c0df426710fa121ddc06 100644 (file)
--- a/src/stdio/fread.c
+++ b/src/stdio/fread.c
@@ -1,4 +1,5 @@
 #include "stdio_impl.h"
+#include <string.h>
 
 #define MIN(a,b) ((a)<(b) ? (a) : (b))
 

diff --git a/src/stdio/freopen.c b/src/stdio/freopen.c
index 7ae116d8d245708dd3f3a6a0a1b1409793e7c5b6..6c1b575f527963566a7b457f29c18dea45b2505a 100644 (file)
--- a/src/stdio/freopen.c
+++ b/src/stdio/freopen.c
@@ -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

diff --git a/src/stdio/ftell.c b/src/stdio/ftell.c
index 3904a1d871dd9229b59ba0c97d13923dfc8d5c14..82371e37b38316d8fdbdb5bf9bf69f8771f003e0 100644 (file)
--- a/src/stdio/ftell.c
+++ b/src/stdio/ftell.c
@@ -1,4 +1,6 @@
 #include "stdio_impl.h"
+#include <limits.h>
+#include <errno.h>
 
 off_t __ftello_unlocked(FILE *f)
 {

diff --git a/src/stdio/fwrite.c b/src/stdio/fwrite.c
index 8027b3061469414d3595d6801f3b4305e3c4499b..d5f6542d6bebe32ec6dac9ac319e8eaf430dfcd4 100644 (file)
--- a/src/stdio/fwrite.c
+++ b/src/stdio/fwrite.c
@@ -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)
 {

diff --git a/src/stdio/getdelim.c b/src/stdio/getdelim.c
index 5015c3a63b403e874ac46651e8ce0a9ff969f358..26093a6cfa02a358c1a50e6e59ac618d8920d86e 100644 (file)
--- a/src/stdio/getdelim.c
+++ b/src/stdio/getdelim.c
@@ -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))
 

diff --git a/src/stdio/gets.c b/src/stdio/gets.c
index 24319eb2dcf62b431648bfef6641b2eda5854476..6c4645e5640b7b9d4df8387346a02122dfc0f5ea 100644 (file)
--- a/src/stdio/gets.c
+++ b/src/stdio/gets.c
@@ -1,4 +1,6 @@
 #include "stdio_impl.h"
+#include <limits.h>
+#include <string.h>
 
 char *gets(char *s)
 {

diff --git a/src/stdio/getwc.c b/src/stdio/getwc.c
index a2818bc4273a4ccf6a462a505fe7e7aa7aafcb3f..a5008f0e5ce12b86e28392fe343dfce47bc2982e 100644 (file)
--- a/src/stdio/getwc.c
+++ b/src/stdio/getwc.c
@@ -1,4 +1,5 @@
 #include "stdio_impl.h"
+#include <wchar.h>
 
 wint_t getwc(FILE *f)
 {

diff --git a/src/stdio/getwchar.c b/src/stdio/getwchar.c
index 2295bd40cd369bb1ad149ea92c3d230aba61be64..bd89e0ec9411074489e847183b6f1aec4c6af2de 100644 (file)
--- a/src/stdio/getwchar.c
+++ b/src/stdio/getwchar.c
@@ -1,4 +1,5 @@
 #include "stdio_impl.h"
+#include <wchar.h>
 
 wint_t getwchar(void)
 {

diff --git a/src/stdio/open_memstream.c b/src/stdio/open_memstream.c
index 687e818dbd5cc857acb98e30d126889f297478c0..c7330abedb26b61b69f204d0f2659cc975b159b1 100644 (file)
--- a/src/stdio/open_memstream.c
+++ b/src/stdio/open_memstream.c
@@ -1,4 +1,7 @@
 #include "stdio_impl.h"
+#include <errno.h>
+#include <limits.h>
+#include <string.h>
 
 struct cookie {
        char **bufp;

diff --git a/src/stdio/open_wmemstream.c b/src/stdio/open_wmemstream.c
index a830b143ebe95cbf6dc4b038bc44b7357b824841..2fe504c798d65918722fd13c9a97d60da388a285 100644 (file)
--- a/src/stdio/open_wmemstream.c
+++ b/src/stdio/open_wmemstream.c
@@ -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;

diff --git a/src/stdio/pclose.c b/src/stdio/pclose.c
index 7fb76ed42622f92f2cdb3a8f9ee04bc583d43db8..080a426245b67be80d5066a539d2b6fabcf20b4f 100644 (file)
--- a/src/stdio/pclose.c
+++ b/src/stdio/pclose.c
@@ -1,5 +1,6 @@
 #include "stdio_impl.h"
-#include "syscall.h"
+#include <errno.h>
+#include <unistd.h>
 
 int pclose(FILE *f)
 {

diff --git a/src/stdio/putwc.c b/src/stdio/putwc.c
index 80b54a472aa8746c13b164d01b17d120fe0830df..4bb74733486cfaf827ddbd58d50f2b3616208756 100644 (file)
--- a/src/stdio/putwc.c
+++ b/src/stdio/putwc.c
@@ -1,4 +1,5 @@
 #include "stdio_impl.h"
+#include <wchar.h>
 
 wint_t putwc(wchar_t c, FILE *f)
 {

diff --git a/src/stdio/putwchar.c b/src/stdio/putwchar.c
index 3aacc1cfad7853753bcb93122b77176a8e04ca2f..b249c4ac10997061355a261ff15cda08743183d9 100644 (file)
--- a/src/stdio/putwchar.c
+++ b/src/stdio/putwchar.c
@@ -1,4 +1,5 @@
 #include "stdio_impl.h"
+#include <wchar.h>
 
 wint_t putwchar(wchar_t c)
 {

diff --git a/src/stdio/ungetwc.c b/src/stdio/ungetwc.c
index 5282fee14577af9109768272e3265a806c58541f..8cc85a6bfd2a00b615ecccdc96fbfc519e4b77f5 100644 (file)
--- a/src/stdio/ungetwc.c
+++ b/src/stdio/ungetwc.c
@@ -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)
 {

diff --git a/src/stdio/vfprintf.c b/src/stdio/vfprintf.c
index 4a2752b275834d76786bc6af95b238f92831e37b..1e7e6a477faeba521537d9146e003596ccaeba3e 100644 (file)
--- a/src/stdio/vfprintf.c
+++ b/src/stdio/vfprintf.c
@@ -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 */
 

diff --git a/src/stdio/vfscanf.c b/src/stdio/vfscanf.c
index 54d08495bbe0a163c75dd91d7c379379b448d38b..fe071e95cfbb6b81a3e43a7ec3fa65c5ce1ca590 100644 (file)
--- a/src/stdio/vfscanf.c
+++ b/src/stdio/vfscanf.c
@@ -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"

diff --git a/src/stdio/vfwprintf.c b/src/stdio/vfwprintf.c
index a42ba195f8b06c6e1b17feb8d46816773344408d..eb0793121ed1b5d8a0e089a24188ffdaf000f3c0 100644 (file)
--- a/src/stdio/vfwprintf.c
+++ b/src/stdio/vfwprintf.c
@@ -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. */

diff --git a/src/stdio/vsnprintf.c b/src/stdio/vsnprintf.c
index 6f19b0287234bd6f9ff414f5dfd490a563a77bd3..be2c44eb176d70a5d867b9f339dd58afe5953ec7 100644 (file)
--- a/src/stdio/vsnprintf.c
+++ b/src/stdio/vsnprintf.c
@@ -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)
 {

diff --git a/src/stdio/vswprintf.c b/src/stdio/vswprintf.c
index f3d4fec1903682ccf0413871cbcf2f6f609b2224..7d237bae72e945e5e4fdc459090e6ab75333636a 100644 (file)
--- a/src/stdio/vswprintf.c
+++ b/src/stdio/vswprintf.c
@@ -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;

diff --git a/src/stdio/vswscanf.c b/src/stdio/vswscanf.c
index a205200a871c1b2dc290aaaac9e01efe382aa892..7a2f7c7a98705c91a462c0bfbb3a029ae7d436f8 100644 (file)
--- a/src/stdio/vswscanf.c
+++ b/src/stdio/vswscanf.c
@@ -1,4 +1,5 @@
 #include "stdio_impl.h"
+#include <wchar.h>
 
 static size_t wstring_read(FILE *f, unsigned char *buf, size_t len)
 {

diff --git a/src/stdlib/strtol.c b/src/stdlib/strtol.c
index 23a2f3b6590bdfc3e4b114902abed698ca6b2388..7ee88794bdac5aac1c3cb6a6b39114def944d8f9 100644 (file)
--- a/src/stdlib/strtol.c
+++ b/src/stdlib/strtol.c
@@ -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)
 {

diff --git a/src/stdlib/wcstod.c b/src/stdlib/wcstod.c
index 03670b0bf03ce6682ba2d34220b4f5058f9f0e60..83f308d3b327fd5f140418721dd1196fcbb94a37 100644 (file)
--- a/src/stdlib/wcstod.c
+++ b/src/stdlib/wcstod.c
@@ -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

diff --git a/src/stdlib/wcstol.c b/src/stdlib/wcstol.c
index 3d7c97da6b257ceee089e80241db7061f5b38c87..4443f5772d90ee32d7aa29fda26b54a0520f938c 100644 (file)
--- a/src/stdlib/wcstol.c
+++ b/src/stdlib/wcstol.c
@@ -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