From d865c4403fc91d1f1ac95ba76febcee9f429bb97 Mon Sep 17 00:00:00 2001 From: Martin Baute Date: Fri, 18 Mar 2016 08:10:39 +0100 Subject: [PATCH] Whitespace cleanups. --- Makefile | 4 ++-- Notes.txt | 1 - Readme.txt | 1 - functions/_PDCLIB/Readme.txt | 1 - functions/_PDCLIB/assert.c | 4 ++++ functions/_PDCLIB/atomax.c | 1 + functions/_PDCLIB/closeall.c | 2 +- functions/_PDCLIB/digits.c | 1 + functions/_PDCLIB/errno.c | 2 +- functions/_PDCLIB/filemode.c | 2 +- functions/_PDCLIB/prepread.c | 3 ++- functions/_PDCLIB/prepwrite.c | 2 +- functions/_PDCLIB/print.c | 4 ++-- functions/_PDCLIB/scan.c | 2 ++ functions/_PDCLIB/seed.c | 1 + functions/_PDCLIB/strtox_main.c | 2 ++ functions/_PDCLIB/strtox_prelim.c | 1 + functions/ctype/isalnum.c | 1 + functions/ctype/isalpha.c | 1 + functions/ctype/isblank.c | 1 + functions/ctype/iscntrl.c | 1 + functions/ctype/isdigit.c | 1 + functions/ctype/isgraph.c | 1 + functions/ctype/islower.c | 1 + functions/ctype/isprint.c | 1 + functions/ctype/ispunct.c | 1 + functions/ctype/isspace.c | 1 + functions/ctype/isupper.c | 1 + functions/ctype/isxdigit.c | 1 + functions/ctype/tolower.c | 2 ++ functions/ctype/toupper.c | 2 ++ functions/inttypes/imaxabs.c | 2 ++ functions/inttypes/imaxdiv.c | 1 + functions/inttypes/strtoimax.c | 1 + functions/inttypes/strtoumax.c | 2 ++ functions/locale/localeconv.c | 2 ++ functions/locale/setlocale.c | 2 ++ functions/stdio/clearerr.c | 2 +- functions/stdio/fclose.c | 3 ++- functions/stdio/feof.c | 2 +- functions/stdio/ferror.c | 2 +- functions/stdio/fflush.c | 5 +++-- functions/stdio/fgetc.c | 1 + functions/stdio/fgetpos.c | 2 ++ functions/stdio/fgets.c | 3 ++- functions/stdio/fopen.c | 5 ++++- functions/stdio/fprintf.c | 1 - functions/stdio/fputc.c | 1 + functions/stdio/fputs.c | 4 +++- functions/stdio/fread.c | 7 +++---- functions/stdio/freopen.c | 5 +++-- functions/stdio/fseek.c | 3 ++- functions/stdio/fsetpos.c | 2 ++ functions/stdio/ftell.c | 2 +- functions/stdio/fwrite.c | 7 +++---- functions/stdio/getc.c | 1 + functions/stdio/getchar.c | 1 + functions/stdio/perror.c | 7 ++++--- functions/stdio/putc.c | 1 + functions/stdio/putchar.c | 1 + functions/stdio/puts.c | 3 ++- functions/stdio/rename.c | 3 ++- functions/stdio/rewind.c | 1 + functions/stdio/setbuf.c | 2 ++ functions/stdio/setvbuf.c | 4 ++-- functions/stdio/sscanf.c | 1 - functions/stdio/testfile.txt | Bin 531 -> 532 bytes functions/stdio/tmpnam.c | 5 +++-- functions/stdio/ungetc.c | 1 + functions/stdio/vfscanf.c | 1 - functions/stdio/vsnprintf.c | 1 - functions/stdio/vsscanf.c | 2 +- functions/stdlib/_Exit.c | 2 ++ functions/stdlib/abort.c | 1 + functions/stdlib/abs.c | 2 ++ functions/stdlib/atexit.c | 2 ++ functions/stdlib/atoi.c | 1 + functions/stdlib/atol.c | 1 + functions/stdlib/atoll.c | 1 + functions/stdlib/bsearch.c | 1 + functions/stdlib/calloc.c | 1 + functions/stdlib/div.c | 1 + functions/stdlib/exit.c | 1 + functions/stdlib/free.c | 2 ++ functions/stdlib/labs.c | 2 ++ functions/stdlib/ldiv.c | 1 + functions/stdlib/llabs.c | 2 ++ functions/stdlib/lldiv.c | 1 + functions/stdlib/malloc.c | 6 +++--- functions/stdlib/qsort.c | 4 +++- functions/stdlib/rand.c | 1 + functions/stdlib/realloc.c | 2 +- functions/stdlib/srand.c | 1 + functions/stdlib/strtol.c | 1 + functions/stdlib/strtoll.c | 1 + functions/stdlib/strtoul.c | 2 ++ functions/stdlib/strtoull.c | 2 ++ functions/string/memchr.c | 1 + functions/string/memcmp.c | 2 ++ functions/string/memcpy.c | 2 ++ functions/string/memmove.c | 2 ++ functions/string/memset.c | 2 ++ functions/string/strcat.c | 2 ++ functions/string/strchr.c | 2 ++ functions/string/strcmp.c | 2 ++ functions/string/strcoll.c | 2 ++ functions/string/strcpy.c | 2 ++ functions/string/strcspn.c | 2 ++ functions/string/strerror.c | 2 ++ functions/string/strlen.c | 2 ++ functions/string/strncat.c | 2 ++ functions/string/strncmp.c | 2 ++ functions/string/strncpy.c | 2 ++ functions/string/strpbrk.c | 2 ++ functions/string/strrchr.c | 2 ++ functions/string/strspn.c | 2 ++ functions/string/strstr.c | 2 ++ functions/string/strtok.c | 2 ++ functions/string/strxfrm.c | 3 ++- includes/ctype.h | 2 +- includes/errno.h | 1 - includes/inttypes.h | 1 - includes/iso646.h | 1 - includes/limits.h | 1 - includes/locale.h | 1 - includes/stdarg.h | 3 +-- includes/stdbool.h | 1 - includes/stddef.h | 1 - includes/stdint.h | 1 - includes/stdio.h | 2 +- includes/stdlib.h | 2 +- internals/_PDCLIB_glue.h | 2 +- internals/_PDCLIB_int.h | 4 ++-- platform/example/Readme.txt | 1 - platform/example/functions/_PDCLIB/_Exit.c | 2 ++ platform/example/functions/_PDCLIB/allocpages.c | 1 + platform/example/functions/_PDCLIB/close.c | 2 ++ platform/example/functions/_PDCLIB/fillbuffer.c | 3 ++- .../example/functions/_PDCLIB/flushbuffer.c | 4 ++-- platform/example/functions/_PDCLIB/open.c | 3 ++- platform/example/functions/_PDCLIB/rename.c | 1 + platform/example/functions/_PDCLIB/seek.c | 2 +- platform/example/functions/_PDCLIB/stdinit.c | 5 +++-- platform/example/functions/signal/raise.c | 2 ++ platform/example/functions/signal/signal.c | 2 ++ platform/example/functions/stdio/remove.c | 2 +- platform/example/functions/stdio/tmpfile.c | 9 +++++---- platform/example/functions/stdlib/getenv.c | 1 + platform/example/functions/stdlib/system.c | 1 + platform/example/includes/signal.h | 1 - platform/example/internals/_PDCLIB_config.h | 2 +- testing/_PDCLIB_test.h | 1 - testing/printf_testcases.h | 4 ++-- 153 files changed, 223 insertions(+), 87 deletions(-) diff --git a/Makefile b/Makefile index 0d0c8e0..8042f30 100644 --- a/Makefile +++ b/Makefile @@ -22,10 +22,10 @@ REGDEPFILES := $(patsubst %,%.d,$(REGFILES)) # All files belonging to the source distribution ALLFILES := $(SRCFILES) $(HDRFILES) $(AUXFILES) -WARNINGS := -Wall -Wextra -pedantic -Wno-unused-parameter -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wno-long-long -Wuninitialized -Wstrict-prototypes +WARNINGS := -Wall -Wextra -pedantic -Wno-unused-parameter -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wno-long-long -Wuninitialized -Wstrict-prototypes CFLAGS := -fno-builtin -g -std=c99 -I./internals -I./testing -I./platform/example/include -I./platform/example/internals $(WARNINGS) $(USERFLAGS) -.PHONY: all clean srcdist bindist test tests testdrivers regtests regtestdrivers todos fixmes find links unlink help +.PHONY: all clean srcdist tests testdrivers regtests regtestdrivers todos fixmes help all: pdclib.a testdrivers regtestdrivers @echo diff --git a/Notes.txt b/Notes.txt index 2dc59c2..8c718fd 100644 --- a/Notes.txt +++ b/Notes.txt @@ -107,4 +107,3 @@ obsessive when it comes to coding style. ;-) hopefully keeping overly ambitious editors from repeating my mistakes. The header files especially should be self-documenting to the point of being a suitable replacement for any library reference book you might be using. - diff --git a/Readme.txt b/Readme.txt index 14df1a6..40a6e97 100644 --- a/Readme.txt +++ b/Readme.txt @@ -212,4 +212,3 @@ I want this released, and I want to think about something else but So, expect significant change to how stdio is done in upcoming releases. Everything *WILL* be stable by the time v1.0 comes around, but until then you will have to accept that I can only deliver "hobby quality" for now. - diff --git a/functions/_PDCLIB/Readme.txt b/functions/_PDCLIB/Readme.txt index 4679687..5010942 100644 --- a/functions/_PDCLIB/Readme.txt +++ b/functions/_PDCLIB/Readme.txt @@ -8,4 +8,3 @@ This directory holds various "internals" of PDCLib: - test drivers for functionality that does not have its own implementation file to put the test driver in. - diff --git a/functions/_PDCLIB/assert.c b/functions/_PDCLIB/assert.c index f4d2cbc..a8fc25b 100644 --- a/functions/_PDCLIB/assert.c +++ b/functions/_PDCLIB/assert.c @@ -29,7 +29,9 @@ void _PDCLIB_assert89( char const * const message ) #endif #ifdef TEST + #include "_PDCLIB_test.h" + #include static int EXPECTED_ABORT = 0; @@ -42,6 +44,7 @@ static void aborthandler( int sig ) } #define NDEBUG + #include static int disabled_test( void ) @@ -53,6 +56,7 @@ static int disabled_test( void ) } #undef NDEBUG + #include int main( void ) diff --git a/functions/_PDCLIB/atomax.c b/functions/_PDCLIB/atomax.c index f05a8af..eaf7ced 100644 --- a/functions/_PDCLIB/atomax.c +++ b/functions/_PDCLIB/atomax.c @@ -29,6 +29,7 @@ _PDCLIB_intmax_t _PDCLIB_atomax( const char * s ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/_PDCLIB/closeall.c b/functions/_PDCLIB/closeall.c index 6c2bed4..3c928e7 100644 --- a/functions/_PDCLIB/closeall.c +++ b/functions/_PDCLIB/closeall.c @@ -25,6 +25,7 @@ void _PDCLIB_closeall( void ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -34,4 +35,3 @@ int main( void ) } #endif - diff --git a/functions/_PDCLIB/digits.c b/functions/_PDCLIB/digits.c index 6fb7f07..d921c2d 100644 --- a/functions/_PDCLIB/digits.c +++ b/functions/_PDCLIB/digits.c @@ -12,6 +12,7 @@ char _PDCLIB_digits[] = "0123456789abcdefghijklmnopqrstuvwxyz"; char _PDCLIB_Xdigits[] = "0123456789ABCDEF"; #ifdef TEST + #include "_PDCLIB_test.h" #include diff --git a/functions/_PDCLIB/errno.c b/functions/_PDCLIB/errno.c index 4cf5ea5..9f84d33 100644 --- a/functions/_PDCLIB/errno.c +++ b/functions/_PDCLIB/errno.c @@ -18,6 +18,7 @@ int * _PDCLIB_errno_func() #endif #ifdef TEST + #include "_PDCLIB_test.h" #include @@ -34,4 +35,3 @@ int main( void ) } #endif - diff --git a/functions/_PDCLIB/filemode.c b/functions/_PDCLIB/filemode.c index 9c3ec24..4c68e8b 100644 --- a/functions/_PDCLIB/filemode.c +++ b/functions/_PDCLIB/filemode.c @@ -57,6 +57,7 @@ unsigned int _PDCLIB_filemode( char const * const mode ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -86,4 +87,3 @@ int main( void ) } #endif - diff --git a/functions/_PDCLIB/prepread.c b/functions/_PDCLIB/prepread.c index 2c5818a..d55ef69 100644 --- a/functions/_PDCLIB/prepread.c +++ b/functions/_PDCLIB/prepread.c @@ -7,6 +7,7 @@ #include #ifndef REGTEST + #include "_PDCLIB_glue.h" int _PDCLIB_prepread( struct _PDCLIB_file_t * stream ) @@ -37,6 +38,7 @@ int _PDCLIB_prepread( struct _PDCLIB_file_t * stream ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -46,4 +48,3 @@ int main( void ) } #endif - diff --git a/functions/_PDCLIB/prepwrite.c b/functions/_PDCLIB/prepwrite.c index a901ccd..dcdc970 100644 --- a/functions/_PDCLIB/prepwrite.c +++ b/functions/_PDCLIB/prepwrite.c @@ -29,6 +29,7 @@ int _PDCLIB_prepwrite( struct _PDCLIB_file_t * stream ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -38,4 +39,3 @@ int main( void ) } #endif - diff --git a/functions/_PDCLIB/print.c b/functions/_PDCLIB/print.c index 768b4a6..1c0f5d6 100644 --- a/functions/_PDCLIB/print.c +++ b/functions/_PDCLIB/print.c @@ -16,8 +16,7 @@ modifiers. */ /* FIXME: one too many flags to work on a 16-bit machine, join some (e.g. the - width flags) into a combined field. -*/ + width flags) into a combined field. */ #define E_minus 1<<0 #define E_plus 1<<1 #define E_alt 1<<2 @@ -548,6 +547,7 @@ static int testprintf( char * buffer, const char * format, ... ) va_end( status.arg ); return status.i; } + #endif #define TEST_CONVERSION_ONLY diff --git a/functions/_PDCLIB/scan.c b/functions/_PDCLIB/scan.c index 7d11a9c..ccd3cdb 100644 --- a/functions/_PDCLIB/scan.c +++ b/functions/_PDCLIB/scan.c @@ -603,6 +603,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) #include "_PDCLIB_test.h" #ifndef REGTEST + static int testscanf( char const * s, char const * format, ... ) { struct _PDCLIB_status_t status; @@ -619,6 +620,7 @@ static int testscanf( char const * s, char const * format, ... ) va_end( status.arg ); return status.n; } + #endif #define TEST_CONVERSION_ONLY diff --git a/functions/_PDCLIB/seed.c b/functions/_PDCLIB/seed.c index 37c9b47..ce7c31c 100644 --- a/functions/_PDCLIB/seed.c +++ b/functions/_PDCLIB/seed.c @@ -7,6 +7,7 @@ unsigned long int _PDCLIB_seed = 1; #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/_PDCLIB/strtox_main.c b/functions/_PDCLIB/strtox_main.c index 3bfdbb8..4808952 100644 --- a/functions/_PDCLIB/strtox_main.c +++ b/functions/_PDCLIB/strtox_main.c @@ -46,7 +46,9 @@ _PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, unsigned int base, uintm #endif #ifdef TEST + #include "_PDCLIB_test.h" + #include int main( void ) diff --git a/functions/_PDCLIB/strtox_prelim.c b/functions/_PDCLIB/strtox_prelim.c index 98f7fce..6e16b35 100644 --- a/functions/_PDCLIB/strtox_prelim.c +++ b/functions/_PDCLIB/strtox_prelim.c @@ -54,6 +54,7 @@ const char * _PDCLIB_strtox_prelim( const char * p, char * sign, int * base ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/ctype/isalnum.c b/functions/ctype/isalnum.c index 52a0cd1..2f02ef0 100644 --- a/functions/ctype/isalnum.c +++ b/functions/ctype/isalnum.c @@ -18,6 +18,7 @@ int isalnum( int c ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/ctype/isalpha.c b/functions/ctype/isalpha.c index a4812d4..962cff2 100644 --- a/functions/ctype/isalpha.c +++ b/functions/ctype/isalpha.c @@ -18,6 +18,7 @@ int isalpha( int c ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/ctype/isblank.c b/functions/ctype/isblank.c index 1ce4931..06c5362 100644 --- a/functions/ctype/isblank.c +++ b/functions/ctype/isblank.c @@ -18,6 +18,7 @@ int isblank( int c ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/ctype/iscntrl.c b/functions/ctype/iscntrl.c index 755a67c..2f885db 100644 --- a/functions/ctype/iscntrl.c +++ b/functions/ctype/iscntrl.c @@ -18,6 +18,7 @@ int iscntrl( int c ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/ctype/isdigit.c b/functions/ctype/isdigit.c index 6a311d9..72714a5 100644 --- a/functions/ctype/isdigit.c +++ b/functions/ctype/isdigit.c @@ -18,6 +18,7 @@ int isdigit( int c ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/ctype/isgraph.c b/functions/ctype/isgraph.c index 932b7be..166baed 100644 --- a/functions/ctype/isgraph.c +++ b/functions/ctype/isgraph.c @@ -18,6 +18,7 @@ int isgraph( int c ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/ctype/islower.c b/functions/ctype/islower.c index 5a97887..3fcfe7b 100644 --- a/functions/ctype/islower.c +++ b/functions/ctype/islower.c @@ -18,6 +18,7 @@ int islower( int c ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/ctype/isprint.c b/functions/ctype/isprint.c index bcafd09..6a7a254 100644 --- a/functions/ctype/isprint.c +++ b/functions/ctype/isprint.c @@ -18,6 +18,7 @@ int isprint( int c ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/ctype/ispunct.c b/functions/ctype/ispunct.c index d7ad21e..8b3ab69 100644 --- a/functions/ctype/ispunct.c +++ b/functions/ctype/ispunct.c @@ -18,6 +18,7 @@ int ispunct( int c ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/ctype/isspace.c b/functions/ctype/isspace.c index ef0a913..8cc08bf 100644 --- a/functions/ctype/isspace.c +++ b/functions/ctype/isspace.c @@ -18,6 +18,7 @@ int isspace( int c ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/ctype/isupper.c b/functions/ctype/isupper.c index 96d2770..02589a6 100644 --- a/functions/ctype/isupper.c +++ b/functions/ctype/isupper.c @@ -18,6 +18,7 @@ int isupper( int c ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/ctype/isxdigit.c b/functions/ctype/isxdigit.c index 51cd727..4d4da56 100644 --- a/functions/ctype/isxdigit.c +++ b/functions/ctype/isxdigit.c @@ -18,6 +18,7 @@ int isxdigit( int c ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/ctype/tolower.c b/functions/ctype/tolower.c index fa9fbf5..573112e 100644 --- a/functions/ctype/tolower.c +++ b/functions/ctype/tolower.c @@ -18,6 +18,7 @@ int tolower( int c ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -30,4 +31,5 @@ int main( void ) TESTCASE( tolower( '[' ) == '[' ); return TEST_RESULTS; } + #endif diff --git a/functions/ctype/toupper.c b/functions/ctype/toupper.c index 2168134..2ef3359 100644 --- a/functions/ctype/toupper.c +++ b/functions/ctype/toupper.c @@ -18,6 +18,7 @@ int toupper( int c ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -30,4 +31,5 @@ int main( void ) TESTCASE( toupper( '[' ) == '[' ); return TEST_RESULTS; } + #endif diff --git a/functions/inttypes/imaxabs.c b/functions/inttypes/imaxabs.c index 79f3dd2..06d029e 100644 --- a/functions/inttypes/imaxabs.c +++ b/functions/inttypes/imaxabs.c @@ -16,7 +16,9 @@ intmax_t imaxabs( intmax_t j ) #endif #ifdef TEST + #include "_PDCLIB_test.h" + #include int main( void ) diff --git a/functions/inttypes/imaxdiv.c b/functions/inttypes/imaxdiv.c index 553f22e..7143c3d 100644 --- a/functions/inttypes/imaxdiv.c +++ b/functions/inttypes/imaxdiv.c @@ -19,6 +19,7 @@ imaxdiv_t imaxdiv( intmax_t numer, intmax_t denom ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/inttypes/strtoimax.c b/functions/inttypes/strtoimax.c index f58a0be..29a3c92 100644 --- a/functions/inttypes/strtoimax.c +++ b/functions/inttypes/strtoimax.c @@ -32,6 +32,7 @@ intmax_t strtoimax( const char * _PDCLIB_restrict nptr, char ** _PDCLIB_restrict #endif #ifdef TEST + #include "_PDCLIB_test.h" #include diff --git a/functions/inttypes/strtoumax.c b/functions/inttypes/strtoumax.c index f998338..9ed16c1 100644 --- a/functions/inttypes/strtoumax.c +++ b/functions/inttypes/strtoumax.c @@ -25,7 +25,9 @@ uintmax_t strtoumax( const char * _PDCLIB_restrict nptr, char ** _PDCLIB_restric #endif #ifdef TEST + #include "_PDCLIB_test.h" + #include int main( void ) diff --git a/functions/locale/localeconv.c b/functions/locale/localeconv.c index 82bf474..56d3d14 100644 --- a/functions/locale/localeconv.c +++ b/functions/locale/localeconv.c @@ -16,6 +16,7 @@ struct lconv * localeconv( void ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -23,4 +24,5 @@ int main( void ) TESTCASE( NO_TESTDRIVER ); return TEST_RESULTS; } + #endif diff --git a/functions/locale/setlocale.c b/functions/locale/setlocale.c index 20b434d..c4d88e1 100644 --- a/functions/locale/setlocale.c +++ b/functions/locale/setlocale.c @@ -16,6 +16,7 @@ char * setlocale( int category, const char * locale ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -23,4 +24,5 @@ int main( void ) TESTCASE( NO_TESTDRIVER ); return TEST_RESULTS; } + #endif diff --git a/functions/stdio/clearerr.c b/functions/stdio/clearerr.c index ca22b03..91cd00a 100644 --- a/functions/stdio/clearerr.c +++ b/functions/stdio/clearerr.c @@ -16,6 +16,7 @@ void clearerr( struct _PDCLIB_file_t * stream ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -49,4 +50,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/fclose.c b/functions/stdio/fclose.c index a5b9e96..7871833 100644 --- a/functions/stdio/fclose.c +++ b/functions/stdio/fclose.c @@ -8,6 +8,7 @@ #include #ifndef REGTEST + #include "_PDCLIB_glue.h" extern struct _PDCLIB_file_t * _PDCLIB_filelist; @@ -66,6 +67,7 @@ int fclose( struct _PDCLIB_file_t * stream ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -97,4 +99,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/feof.c b/functions/stdio/feof.c index 06073bd..a57071f 100644 --- a/functions/stdio/feof.c +++ b/functions/stdio/feof.c @@ -16,6 +16,7 @@ int feof( struct _PDCLIB_file_t * stream ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -25,4 +26,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/ferror.c b/functions/stdio/ferror.c index 7b56637..54f43f0 100644 --- a/functions/stdio/ferror.c +++ b/functions/stdio/ferror.c @@ -16,6 +16,7 @@ int ferror( struct _PDCLIB_file_t * stream ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -25,4 +26,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/fflush.c b/functions/stdio/fflush.c index d2ed11b..5a0bc36 100644 --- a/functions/stdio/fflush.c +++ b/functions/stdio/fflush.c @@ -7,6 +7,7 @@ #include #ifndef REGTEST + #include "_PDCLIB_glue.h" extern struct _PDCLIB_file_t * _PDCLIB_filelist; @@ -36,10 +37,11 @@ int fflush( struct _PDCLIB_file_t * stream ) return _PDCLIB_flushbuffer( stream ); } } - + #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -49,4 +51,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/fgetc.c b/functions/stdio/fgetc.c index b759429..823bef7 100644 --- a/functions/stdio/fgetc.c +++ b/functions/stdio/fgetc.c @@ -26,6 +26,7 @@ int fgetc( struct _PDCLIB_file_t * stream ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdio/fgetpos.c b/functions/stdio/fgetpos.c index 4934b42..db9be06 100644 --- a/functions/stdio/fgetpos.c +++ b/functions/stdio/fgetpos.c @@ -19,7 +19,9 @@ int fgetpos( struct _PDCLIB_file_t * _PDCLIB_restrict stream, struct _PDCLIB_fpo #endif #ifdef TEST + #include "_PDCLIB_test.h" + #include int main( void ) diff --git a/functions/stdio/fgets.c b/functions/stdio/fgets.c index 955c48d..2e4432d 100644 --- a/functions/stdio/fgets.c +++ b/functions/stdio/fgets.c @@ -47,7 +47,9 @@ char * fgets( char * _PDCLIB_restrict s, int size, struct _PDCLIB_file_t * _PDCL #endif #ifdef TEST + #include "_PDCLIB_test.h" + #include int main( void ) @@ -84,4 +86,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/fopen.c b/functions/stdio/fopen.c index fa0185f..3bbab78 100644 --- a/functions/stdio/fopen.c +++ b/functions/stdio/fopen.c @@ -8,7 +8,9 @@ #include #ifndef REGTEST + #include "_PDCLIB_glue.h" + #include extern struct _PDCLIB_file_t * _PDCLIB_filelist; @@ -35,7 +37,7 @@ struct _PDCLIB_file_t * fopen( const char * _PDCLIB_restrict filename, const cha /* no memory */ return NULL; } - if ( ( rc->status = _PDCLIB_filemode( mode ) ) == 0 ) + if ( ( rc->status = _PDCLIB_filemode( mode ) ) == 0 ) { /* invalid mode */ free( rc ); @@ -73,6 +75,7 @@ struct _PDCLIB_file_t * fopen( const char * _PDCLIB_restrict filename, const cha #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdio/fprintf.c b/functions/stdio/fprintf.c index 1974627..e95f575 100644 --- a/functions/stdio/fprintf.c +++ b/functions/stdio/fprintf.c @@ -39,4 +39,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/fputc.c b/functions/stdio/fputc.c index 1ea99e9..872b741 100644 --- a/functions/stdio/fputc.c +++ b/functions/stdio/fputc.c @@ -35,6 +35,7 @@ int fputc( int c, struct _PDCLIB_file_t * stream ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdio/fputs.c b/functions/stdio/fputs.c index bb5593b..fd181cf 100644 --- a/functions/stdio/fputs.c +++ b/functions/stdio/fputs.c @@ -7,6 +7,7 @@ #include #ifndef REGTEST + #include "_PDCLIB_glue.h" int fputs( const char * _PDCLIB_restrict s, struct _PDCLIB_file_t * _PDCLIB_restrict stream ) @@ -44,7 +45,9 @@ int fputs( const char * _PDCLIB_restrict s, struct _PDCLIB_file_t * _PDCLIB_rest } #endif + #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -63,4 +66,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/fread.c b/functions/stdio/fread.c index 87b7acc..5b093ff 100644 --- a/functions/stdio/fread.c +++ b/functions/stdio/fread.c @@ -5,14 +5,13 @@ */ #include +#include +#include #ifndef REGTEST #include "_PDCLIB_glue.h" -#include -#include - size_t fread( void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, struct _PDCLIB_file_t * _PDCLIB_restrict stream ) { if ( _PDCLIB_prepread( stream ) == EOF ) @@ -42,6 +41,7 @@ size_t fread( void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, struct _PD #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -79,4 +79,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/freopen.c b/functions/stdio/freopen.c index c4bb34c..29d72eb 100644 --- a/functions/stdio/freopen.c +++ b/functions/stdio/freopen.c @@ -5,12 +5,12 @@ */ #include +#include +#include #ifndef REGTEST #include "_PDCLIB_glue.h" -#include -#include struct _PDCLIB_file_t * freopen( const char * _PDCLIB_restrict filename, const char * _PDCLIB_restrict mode, struct _PDCLIB_file_t * _PDCLIB_restrict stream ) { @@ -75,6 +75,7 @@ struct _PDCLIB_file_t * freopen( const char * _PDCLIB_restrict filename, const c #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdio/fseek.c b/functions/stdio/fseek.c index 6f56b6e..c8427f8 100644 --- a/functions/stdio/fseek.c +++ b/functions/stdio/fseek.c @@ -30,7 +30,9 @@ int fseek( struct _PDCLIB_file_t * stream, long offset, int whence ) #endif #ifdef TEST + #include "_PDCLIB_test.h" + #include int main( void ) @@ -81,4 +83,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/fsetpos.c b/functions/stdio/fsetpos.c index 32d18ba..f2ebd2a 100644 --- a/functions/stdio/fsetpos.c +++ b/functions/stdio/fsetpos.c @@ -7,6 +7,7 @@ #include #ifndef REGTEST + #include "_PDCLIB_glue.h" int fsetpos( struct _PDCLIB_file_t * stream, const struct _PDCLIB_fpos_t * pos ) @@ -30,6 +31,7 @@ int fsetpos( struct _PDCLIB_file_t * stream, const struct _PDCLIB_fpos_t * pos ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdio/ftell.c b/functions/stdio/ftell.c index bf6f792..f4bd300 100644 --- a/functions/stdio/ftell.c +++ b/functions/stdio/ftell.c @@ -42,6 +42,7 @@ long int ftell( struct _PDCLIB_file_t * stream ) #endif #ifdef TEST + #include "_PDCLIB_test.h" #include @@ -97,4 +98,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/fwrite.c b/functions/stdio/fwrite.c index 482cdb8..e64e36c 100644 --- a/functions/stdio/fwrite.c +++ b/functions/stdio/fwrite.c @@ -5,14 +5,13 @@ */ #include +#include +#include #ifndef REGTEST #include "_PDCLIB_glue.h" -#include -#include - size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, struct _PDCLIB_file_t * _PDCLIB_restrict stream ) { if ( _PDCLIB_prepwrite( stream ) == EOF ) @@ -82,6 +81,7 @@ size_t fwrite( const void * _PDCLIB_restrict ptr, size_t size, size_t nmemb, str #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -91,4 +91,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/getc.c b/functions/stdio/getc.c index 57ba171..3d082b3 100644 --- a/functions/stdio/getc.c +++ b/functions/stdio/getc.c @@ -16,6 +16,7 @@ int getc( struct _PDCLIB_file_t * stream ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdio/getchar.c b/functions/stdio/getchar.c index 7e1fc74..34ee545 100644 --- a/functions/stdio/getchar.c +++ b/functions/stdio/getchar.c @@ -16,6 +16,7 @@ int getchar( void ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdio/perror.c b/functions/stdio/perror.c index a518598..022f82d 100644 --- a/functions/stdio/perror.c +++ b/functions/stdio/perror.c @@ -5,12 +5,11 @@ */ #include - -#ifndef REGTEST - #include #include +#ifndef REGTEST + /* TODO: Doing this via a static array is not the way to do it. */ void perror( const char * s ) { @@ -32,7 +31,9 @@ void perror( const char * s ) #endif #ifdef TEST + #include "_PDCLIB_test.h" + #include #include #include diff --git a/functions/stdio/putc.c b/functions/stdio/putc.c index 7693ba9..c1eb2b0 100644 --- a/functions/stdio/putc.c +++ b/functions/stdio/putc.c @@ -16,6 +16,7 @@ int putc( int c, struct _PDCLIB_file_t * stream ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdio/putchar.c b/functions/stdio/putchar.c index 2711fd7..15bf299 100644 --- a/functions/stdio/putchar.c +++ b/functions/stdio/putchar.c @@ -16,6 +16,7 @@ int putchar( int c ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdio/puts.c b/functions/stdio/puts.c index 94472ae..aa759dc 100644 --- a/functions/stdio/puts.c +++ b/functions/stdio/puts.c @@ -7,6 +7,7 @@ #include #ifndef REGTEST + #include "_PDCLIB_glue.h" extern char * _PDCLIB_eol; @@ -43,6 +44,7 @@ int puts( const char * s ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -63,4 +65,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/rename.c b/functions/stdio/rename.c index cd81c6a..cba22c8 100644 --- a/functions/stdio/rename.c +++ b/functions/stdio/rename.c @@ -7,6 +7,7 @@ #include #ifndef REGTEST + #include "_PDCLIB_glue.h" #include @@ -31,6 +32,7 @@ int rename( const char * old, const char * new ) #endif #ifdef TEST + #include "_PDCLIB_test.h" #include @@ -80,4 +82,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/rewind.c b/functions/stdio/rewind.c index d54d374..a449b7d 100644 --- a/functions/stdio/rewind.c +++ b/functions/stdio/rewind.c @@ -17,6 +17,7 @@ void rewind( struct _PDCLIB_file_t * stream ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdio/setbuf.c b/functions/stdio/setbuf.c index 48e4b8c..6c32072 100644 --- a/functions/stdio/setbuf.c +++ b/functions/stdio/setbuf.c @@ -23,7 +23,9 @@ void setbuf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, char * _PDCLIB_res #endif #ifdef TEST + #include "_PDCLIB_test.h" + #include int main( void ) diff --git a/functions/stdio/setvbuf.c b/functions/stdio/setvbuf.c index dca5706..00592ff 100644 --- a/functions/stdio/setvbuf.c +++ b/functions/stdio/setvbuf.c @@ -36,7 +36,7 @@ int setvbuf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, char * _PDCLIB_res */ /* If current buffer is big enough for requested size, but not over twice as big (and wasting memory space), we use the - current buffer (i.e., do nothing), to save the malloc() / + current buffer (i.e., do nothing), to save the malloc() / free() overhead. */ if ( ( stream->bufsize < size ) || ( stream->bufsize > ( size << 1 ) ) ) @@ -68,6 +68,7 @@ int setvbuf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, char * _PDCLIB_res #endif #ifdef TEST + #include "_PDCLIB_test.h" #include @@ -105,4 +106,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/sscanf.c b/functions/stdio/sscanf.c index 5de77ae..9ba830d 100644 --- a/functions/stdio/sscanf.c +++ b/functions/stdio/sscanf.c @@ -37,4 +37,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/testfile.txt b/functions/stdio/testfile.txt index 62f1825430243cb0b7e4c8498195bb38fb5d7dbc..f08c4d3b87ef22e66285ea7553db8181555b0561 100644 GIT binary patch delta 9 QcmbQtGKFP>FcTve01ZY000000 delta 7 OcmbQjGMQzAFcSa?QUUb< diff --git a/functions/stdio/tmpnam.c b/functions/stdio/tmpnam.c index 276a42c..6b444ce 100644 --- a/functions/stdio/tmpnam.c +++ b/functions/stdio/tmpnam.c @@ -8,9 +8,10 @@ #ifndef REGTEST -#include #include "_PDCLIB_glue.h" +#include + char * tmpnam( char * s ) { static char filename[ L_tmpnam ]; @@ -27,6 +28,7 @@ char * tmpnam( char * s ) #endif #ifdef TEST + #include "_PDCLIB_test.h" #include @@ -38,4 +40,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/ungetc.c b/functions/stdio/ungetc.c index 240dc40..dc5260b 100644 --- a/functions/stdio/ungetc.c +++ b/functions/stdio/ungetc.c @@ -20,6 +20,7 @@ int ungetc( int c, struct _PDCLIB_file_t * stream ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdio/vfscanf.c b/functions/stdio/vfscanf.c index eeae09e..a19f18e 100644 --- a/functions/stdio/vfscanf.c +++ b/functions/stdio/vfscanf.c @@ -110,4 +110,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/vsnprintf.c b/functions/stdio/vsnprintf.c index e890c71..3fba970 100644 --- a/functions/stdio/vsnprintf.c +++ b/functions/stdio/vsnprintf.c @@ -77,4 +77,3 @@ int main( void ) } #endif - diff --git a/functions/stdio/vsscanf.c b/functions/stdio/vsscanf.c index 9209726..a9076d0 100644 --- a/functions/stdio/vsscanf.c +++ b/functions/stdio/vsscanf.c @@ -6,9 +6,9 @@ #include #include +#include #ifndef REGTEST -#include int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, va_list arg ) { diff --git a/functions/stdlib/_Exit.c b/functions/stdlib/_Exit.c index 5a43ee2..a1375d9 100644 --- a/functions/stdlib/_Exit.c +++ b/functions/stdlib/_Exit.c @@ -8,6 +8,7 @@ #include #ifndef REGTEST + #include "_PDCLIB_glue.h" void _Exit( int status ) @@ -21,6 +22,7 @@ void _Exit( int status ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdlib/abort.c b/functions/stdlib/abort.c index 0c34283..69422f9 100644 --- a/functions/stdlib/abort.c +++ b/functions/stdlib/abort.c @@ -18,6 +18,7 @@ void abort( void ) #endif #ifdef TEST + #include "_PDCLIB_test.h" #include diff --git a/functions/stdlib/abs.c b/functions/stdlib/abs.c index 4e8302b..7a634e3 100644 --- a/functions/stdlib/abs.c +++ b/functions/stdlib/abs.c @@ -16,7 +16,9 @@ int abs( int j ) #endif #ifdef TEST + #include "_PDCLIB_test.h" + #include int main( void ) diff --git a/functions/stdlib/atexit.c b/functions/stdlib/atexit.c index 89832f1..42a98ed 100644 --- a/functions/stdlib/atexit.c +++ b/functions/stdlib/atexit.c @@ -27,7 +27,9 @@ int atexit( void (*func)( void ) ) #endif #ifdef TEST + #include "_PDCLIB_test.h" + #include static int flags[ 32 ]; diff --git a/functions/stdlib/atoi.c b/functions/stdlib/atoi.c index eac0e16..eaa9100 100644 --- a/functions/stdlib/atoi.c +++ b/functions/stdlib/atoi.c @@ -16,6 +16,7 @@ int atoi( const char * s ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdlib/atol.c b/functions/stdlib/atol.c index fb5e512..df17e83 100644 --- a/functions/stdlib/atol.c +++ b/functions/stdlib/atol.c @@ -16,6 +16,7 @@ long int atol( const char * s ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdlib/atoll.c b/functions/stdlib/atoll.c index f7fa824..8b65b35 100644 --- a/functions/stdlib/atoll.c +++ b/functions/stdlib/atoll.c @@ -16,6 +16,7 @@ long long int atoll( const char * s ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdlib/bsearch.c b/functions/stdlib/bsearch.c index 835407f..211c55c 100644 --- a/functions/stdlib/bsearch.c +++ b/functions/stdlib/bsearch.c @@ -37,6 +37,7 @@ void * bsearch( const void * key, const void * base, size_t nmemb, size_t size, #endif #ifdef TEST + #include "_PDCLIB_test.h" static int compare( const void * left, const void * right ) diff --git a/functions/stdlib/calloc.c b/functions/stdlib/calloc.c index abb63b0..d736065 100644 --- a/functions/stdlib/calloc.c +++ b/functions/stdlib/calloc.c @@ -24,6 +24,7 @@ void * calloc( size_t nmemb, size_t size ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdlib/div.c b/functions/stdlib/div.c index 8aabad6..5d502c8 100644 --- a/functions/stdlib/div.c +++ b/functions/stdlib/div.c @@ -20,6 +20,7 @@ div_t div( int numer, int denom ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdlib/exit.c b/functions/stdlib/exit.c index 1fe84ef..b922cb0 100644 --- a/functions/stdlib/exit.c +++ b/functions/stdlib/exit.c @@ -32,6 +32,7 @@ void exit( int status ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdlib/free.c b/functions/stdlib/free.c index 2dc9d6d..b1cdc75 100644 --- a/functions/stdlib/free.c +++ b/functions/stdlib/free.c @@ -37,7 +37,9 @@ void free( void * ptr ) #endif #ifdef TEST + #include "_PDCLIB_test.h" + #include int main( void ) diff --git a/functions/stdlib/labs.c b/functions/stdlib/labs.c index 2888928..3653453 100644 --- a/functions/stdlib/labs.c +++ b/functions/stdlib/labs.c @@ -16,7 +16,9 @@ long int labs( long int j ) #endif #ifdef TEST + #include "_PDCLIB_test.h" + #include int main( void ) diff --git a/functions/stdlib/ldiv.c b/functions/stdlib/ldiv.c index cf579fb..0f51944 100644 --- a/functions/stdlib/ldiv.c +++ b/functions/stdlib/ldiv.c @@ -20,6 +20,7 @@ ldiv_t ldiv( long int numer, long int denom ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdlib/llabs.c b/functions/stdlib/llabs.c index 78a56c3..bc05bf3 100644 --- a/functions/stdlib/llabs.c +++ b/functions/stdlib/llabs.c @@ -16,7 +16,9 @@ long long int llabs( long long int j ) #endif #ifdef TEST + #include "_PDCLIB_test.h" + #include int main( void ) diff --git a/functions/stdlib/lldiv.c b/functions/stdlib/lldiv.c index e6552c3..4219e31 100644 --- a/functions/stdlib/lldiv.c +++ b/functions/stdlib/lldiv.c @@ -20,6 +20,7 @@ lldiv_t lldiv( long long int numer, long long int denom ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdlib/malloc.c b/functions/stdlib/malloc.c index 32235a2..641a859 100644 --- a/functions/stdlib/malloc.c +++ b/functions/stdlib/malloc.c @@ -240,7 +240,7 @@ int test_nodes( char const * const action, int expected_pages, ... ) PRINT( " - memlist first: %#.4x - last: %#.4x", ( _PDCLIB_memlist.first == NULL ) ? NULL : (char *)_PDCLIB_memlist.first - (char *)pages_start, ( _PDCLIB_memlist.last == NULL ) ? NULL : (char *)_PDCLIB_memlist.last - (char *)pages_start ); - if ( ( firstnode != 0 ) && + if ( ( firstnode != 0 ) && ( ( ( (char *)_PDCLIB_memlist.first - (char *)pages_start ) != firstnode ) || ( ( (char *)_PDCLIB_memlist.last - (char *)pages_start ) != lastnode ) ) ) { @@ -255,7 +255,7 @@ int test_nodes( char const * const action, int expected_pages, ... ) return result; } -#endif +#endif /* Note that this test driver heavily tests *internals* of the implementation above (and of free() and realloc(), too). That means that changes in the @@ -270,7 +270,7 @@ int main( void ) void * ptr1, * ptr2, * ptr3, * ptr4, * ptr5, * ptr6, * ptr7, * ptr8, * ptr9, * ptrA, * ptrB, * ptrC; pages_start = _PDCLIB_allocpages( 0 ); - PRINT( "\nEffective is: %#.4x\nsizeof( memnode ) is: %#.2x\n\n", EFFECTIVE, sizeof( struct _PDCLIB_memnode_t ) ); + PRINT( "\nEffective is: %#.4x\nsizeof( memnode ) is: %#.2x\n\n", EFFECTIVE, sizeof( struct _PDCLIB_memnode_t ) ); /* Allocating 10 bytes; expecting one page allocation and a node split */ TESTCASE( MEMTEST( ptr1, 10 ) ); diff --git a/functions/stdlib/qsort.c b/functions/stdlib/qsort.c index 30e0133..e26ea86 100644 --- a/functions/stdlib/qsort.c +++ b/functions/stdlib/qsort.c @@ -33,7 +33,7 @@ static inline void memswp( char * i, char * j, size_t size ) #define PUSH( base, limit ) stackptr[0] = base; stackptr[1] = limit; stackptr += 2 #define POP( base, limit ) stackptr -= 2; base = stackptr[0]; limit = stackptr[1] /* TODO: Stack usage is log2( nmemb ) (minus what T shaves off the worst case). - Worst-case nmemb is platform dependent and should probably be + Worst-case nmemb is platform dependent and should probably be configured through _PDCLIB_config.h. */ #define STACKSIZE 64 @@ -128,7 +128,9 @@ void qsort( void * base, size_t nmemb, size_t size, int (*compar)( const void *, #endif #ifdef TEST + #include "_PDCLIB_test.h" + #include #include diff --git a/functions/stdlib/rand.c b/functions/stdlib/rand.c index 1e8f3cd..779b3b2 100644 --- a/functions/stdlib/rand.c +++ b/functions/stdlib/rand.c @@ -17,6 +17,7 @@ int rand( void ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdlib/realloc.c b/functions/stdlib/realloc.c index d64d756..cbc01d4 100644 --- a/functions/stdlib/realloc.c +++ b/functions/stdlib/realloc.c @@ -44,6 +44,7 @@ void * realloc( void * ptr, size_t size ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -53,4 +54,3 @@ int main( void ) } #endif - diff --git a/functions/stdlib/srand.c b/functions/stdlib/srand.c index 3478cb0..39c37ec 100644 --- a/functions/stdlib/srand.c +++ b/functions/stdlib/srand.c @@ -16,6 +16,7 @@ void srand( unsigned int seed ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/stdlib/strtol.c b/functions/stdlib/strtol.c index ce75539..d89a648 100644 --- a/functions/stdlib/strtol.c +++ b/functions/stdlib/strtol.c @@ -32,6 +32,7 @@ long int strtol( const char * s, char ** endptr, int base ) #endif #ifdef TEST + #include "_PDCLIB_test.h" #include diff --git a/functions/stdlib/strtoll.c b/functions/stdlib/strtoll.c index de71194..24c3e8e 100644 --- a/functions/stdlib/strtoll.c +++ b/functions/stdlib/strtoll.c @@ -32,6 +32,7 @@ long long int strtoll( const char * s, char ** endptr, int base ) #endif #ifdef TEST + #include "_PDCLIB_test.h" #include diff --git a/functions/stdlib/strtoul.c b/functions/stdlib/strtoul.c index 0bcb7dd..1a93477 100644 --- a/functions/stdlib/strtoul.c +++ b/functions/stdlib/strtoul.c @@ -25,7 +25,9 @@ unsigned long int strtoul( const char * s, char ** endptr, int base ) #endif #ifdef TEST + #include "_PDCLIB_test.h" + #include int main( void ) diff --git a/functions/stdlib/strtoull.c b/functions/stdlib/strtoull.c index 17d283f..e207110 100644 --- a/functions/stdlib/strtoull.c +++ b/functions/stdlib/strtoull.c @@ -25,7 +25,9 @@ unsigned long long int strtoull( const char * s, char ** endptr, int base ) #endif #ifdef TEST + #include "_PDCLIB_test.h" + #include int main( void ) diff --git a/functions/string/memchr.c b/functions/string/memchr.c index 9701b94..29598a7 100644 --- a/functions/string/memchr.c +++ b/functions/string/memchr.c @@ -25,6 +25,7 @@ void * memchr( const void * s, int c, size_t n ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/functions/string/memcmp.c b/functions/string/memcmp.c index 323c586..3743f78 100644 --- a/functions/string/memcmp.c +++ b/functions/string/memcmp.c @@ -27,6 +27,7 @@ int memcmp( const void * s1, const void * s2, size_t n ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -38,4 +39,5 @@ int main( void ) TESTCASE( memcmp( xxxxx, abcde, 1 ) > 0 ); return 0; } + #endif diff --git a/functions/string/memcpy.c b/functions/string/memcpy.c index ded60b1..21ef10e 100644 --- a/functions/string/memcpy.c +++ b/functions/string/memcpy.c @@ -22,6 +22,7 @@ void * memcpy( void * _PDCLIB_restrict s1, const void * _PDCLIB_restrict s2, siz #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -35,4 +36,5 @@ int main( void ) TESTCASE( s[10] == 'x' ); return TEST_RESULTS; } + #endif diff --git a/functions/string/memmove.c b/functions/string/memmove.c index f83a1ab..af89813 100644 --- a/functions/string/memmove.c +++ b/functions/string/memmove.c @@ -34,6 +34,7 @@ void * memmove( void * s1, const void * s2, size_t n ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -47,4 +48,5 @@ int main( void ) TESTCASE( s[4] == 'a' ); return TEST_RESULTS; } + #endif diff --git a/functions/string/memset.c b/functions/string/memset.c index 4946ec4..522ad77 100644 --- a/functions/string/memset.c +++ b/functions/string/memset.c @@ -21,6 +21,7 @@ void * memset( void * s, int c, size_t n ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -35,4 +36,5 @@ int main( void ) TESTCASE( s[1] == 'o' ); return TEST_RESULTS; } + #endif diff --git a/functions/string/strcat.c b/functions/string/strcat.c index 50d66ee..18fd409 100644 --- a/functions/string/strcat.c +++ b/functions/string/strcat.c @@ -22,6 +22,7 @@ char * strcat( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2 ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -41,4 +42,5 @@ int main( void ) TESTCASE( s[6] == 'e' ); return TEST_RESULTS; } + #endif diff --git a/functions/string/strchr.c b/functions/string/strchr.c index 8c6e8a4..621100e 100644 --- a/functions/string/strchr.c +++ b/functions/string/strchr.c @@ -23,6 +23,7 @@ char * strchr( const char * s, int c ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -35,4 +36,5 @@ int main( void ) TESTCASE( strchr( abccd, 'c' ) == &abccd[2] ); return TEST_RESULTS; } + #endif diff --git a/functions/string/strcmp.c b/functions/string/strcmp.c index 483260c..639fc10 100644 --- a/functions/string/strcmp.c +++ b/functions/string/strcmp.c @@ -21,6 +21,7 @@ int strcmp( const char * s1, const char * s2 ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -36,4 +37,5 @@ int main( void ) TESTCASE( strcmp( abcde, cmpabcd_ ) < 0 ); return TEST_RESULTS; } + #endif diff --git a/functions/string/strcoll.c b/functions/string/strcoll.c index 4b2529b..6b012b7 100644 --- a/functions/string/strcoll.c +++ b/functions/string/strcoll.c @@ -23,6 +23,7 @@ int strcoll( const char * s1, const char * s2 ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -36,4 +37,5 @@ int main( void ) TESTCASE( strcmp( abcde, empty ) > 0 ); return TEST_RESULTS; } + #endif diff --git a/functions/string/strcpy.c b/functions/string/strcpy.c index d66cbab..e0357c8 100644 --- a/functions/string/strcpy.c +++ b/functions/string/strcpy.c @@ -18,6 +18,7 @@ char * strcpy( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2 ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -32,4 +33,5 @@ int main( void ) TESTCASE( s[5] == '\0' ); return TEST_RESULTS; } + #endif diff --git a/functions/string/strcspn.c b/functions/string/strcspn.c index baf8fc7..84f8af1 100644 --- a/functions/string/strcspn.c +++ b/functions/string/strcspn.c @@ -30,6 +30,7 @@ size_t strcspn( const char * s1, const char * s2 ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -45,4 +46,5 @@ int main( void ) TESTCASE( strcspn( abcde, "cba" ) == 0 ); return TEST_RESULTS; } + #endif diff --git a/functions/string/strerror.c b/functions/string/strerror.c index 2b77640..59747f1 100644 --- a/functions/string/strerror.c +++ b/functions/string/strerror.c @@ -26,6 +26,7 @@ char * strerror( int errnum ) #endif #ifdef TEST + #include "_PDCLIB_test.h" #include @@ -36,4 +37,5 @@ int main( void ) TESTCASE( strerror( ERANGE ) != strerror( EDOM ) ); return TEST_RESULTS; } + #endif diff --git a/functions/string/strlen.c b/functions/string/strlen.c index 042582a..c1a620e 100644 --- a/functions/string/strlen.c +++ b/functions/string/strlen.c @@ -21,6 +21,7 @@ size_t strlen( const char * s ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -29,4 +30,5 @@ int main( void ) TESTCASE( strlen( "" ) == 0 ); return TEST_RESULTS; } + #endif diff --git a/functions/string/strncat.c b/functions/string/strncat.c index 18d8ed5..ba20edc 100644 --- a/functions/string/strncat.c +++ b/functions/string/strncat.c @@ -29,6 +29,7 @@ char * strncat( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, si #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -55,4 +56,5 @@ int main( void ) TESTCASE( s[8] == '\0' ); return TEST_RESULTS; } + #endif diff --git a/functions/string/strncmp.c b/functions/string/strncmp.c index 75b399d..1e9119d 100644 --- a/functions/string/strncmp.c +++ b/functions/string/strncmp.c @@ -29,6 +29,7 @@ int strncmp( const char * s1, const char * s2, size_t n ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -49,4 +50,5 @@ int main( void ) TESTCASE( strncmp( abcde, cmpabcd_, 10 ) < 0 ); return TEST_RESULTS; } + #endif diff --git a/functions/string/strncpy.c b/functions/string/strncpy.c index 2c58d53..da1397a 100644 --- a/functions/string/strncpy.c +++ b/functions/string/strncpy.c @@ -30,6 +30,7 @@ char * strncpy( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, si #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -51,4 +52,5 @@ int main( void ) TESTCASE( s[3] == 'd' ); return TEST_RESULTS; } + #endif diff --git a/functions/string/strpbrk.c b/functions/string/strpbrk.c index 1615ce3..e95f0c1 100644 --- a/functions/string/strpbrk.c +++ b/functions/string/strpbrk.c @@ -30,6 +30,7 @@ char * strpbrk( const char * s1, const char * s2 ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -44,4 +45,5 @@ int main( void ) TESTCASE( strpbrk( abcde, "cba" ) == &abcde[0] ); return TEST_RESULTS; } + #endif diff --git a/functions/string/strrchr.c b/functions/string/strrchr.c index b8a83f0..c2369fa 100644 --- a/functions/string/strrchr.c +++ b/functions/string/strrchr.c @@ -25,6 +25,7 @@ char * strrchr( const char * s, int c ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -36,4 +37,5 @@ int main( void ) TESTCASE( strrchr( abccd, 'c' ) == &abccd[3] ); return TEST_RESULTS; } + #endif diff --git a/functions/string/strspn.c b/functions/string/strspn.c index 8869a84..7b55b08 100644 --- a/functions/string/strspn.c +++ b/functions/string/strspn.c @@ -35,6 +35,7 @@ size_t strspn( const char * s1, const char * s2 ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -44,4 +45,5 @@ int main( void ) TESTCASE( strspn( abcde, abcde ) == 5 ); return TEST_RESULTS; } + #endif diff --git a/functions/string/strstr.c b/functions/string/strstr.c index 5c97a75..aee282f 100644 --- a/functions/string/strstr.c +++ b/functions/string/strstr.c @@ -33,6 +33,7 @@ char * strstr( const char * s1, const char * s2 ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -46,4 +47,5 @@ int main( void ) TESTCASE( strstr( s, "abcde" ) == &s[10] ); return TEST_RESULTS; } + #endif diff --git a/functions/string/strtok.c b/functions/string/strtok.c index 3c427c5..69c2d68 100644 --- a/functions/string/strtok.c +++ b/functions/string/strtok.c @@ -73,6 +73,7 @@ char * strtok( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2 ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -102,4 +103,5 @@ int main( void ) TESTCASE( strtok( NULL, "_" ) == NULL ); return TEST_RESULTS; } + #endif diff --git a/functions/string/strxfrm.c b/functions/string/strxfrm.c index 9b61922..c16f1e0 100644 --- a/functions/string/strxfrm.c +++ b/functions/string/strxfrm.c @@ -26,6 +26,7 @@ size_t strxfrm( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, si #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -43,5 +44,5 @@ int main( void ) TESTCASE( s[10] == '\0' ); return TEST_RESULTS; } -#endif +#endif diff --git a/includes/ctype.h b/includes/ctype.h index 27b66aa..168900a 100644 --- a/includes/ctype.h +++ b/includes/ctype.h @@ -64,7 +64,7 @@ int ispunct( int c ); /* Returns true for every standard whitespace character (' ', '\f', '\n', '\r', '\t', '\v') in the "C" locale. In any other locale, also returns true for a locale-specific set of characters for which isalnum() is false. -*/ +*/ int isspace( int c ); /* Returns true for uppercase letters in the "C" locale. diff --git a/includes/errno.h b/includes/errno.h index 2ffed53..e0db955 100644 --- a/includes/errno.h +++ b/includes/errno.h @@ -15,4 +15,3 @@ #define EDOM _PDCLIB_EDOM #endif - diff --git a/includes/inttypes.h b/includes/inttypes.h index ae36980..5252937 100644 --- a/includes/inttypes.h +++ b/includes/inttypes.h @@ -247,4 +247,3 @@ uintmax_t strtoumax( const char * _PDCLIB_restrict nptr, char * * _PDCLIB_restri /* TODO: wcstoimax(), wcstoumax() */ #endif - diff --git a/includes/iso646.h b/includes/iso646.h index 3b0c481..98a023f 100644 --- a/includes/iso646.h +++ b/includes/iso646.h @@ -20,4 +20,3 @@ #define xor_eq ^= #endif - diff --git a/includes/limits.h b/includes/limits.h index 378fec6..e949b2f 100644 --- a/includes/limits.h +++ b/includes/limits.h @@ -33,4 +33,3 @@ #define ULONG_MAX _PDCLIB_ULONG_MAX #endif - diff --git a/includes/locale.h b/includes/locale.h index 79e441e..6d46536 100644 --- a/includes/locale.h +++ b/includes/locale.h @@ -96,4 +96,3 @@ char * setlocale( int category, const char * locale ); struct lconv * localeconv( void ); #endif - diff --git a/includes/stdarg.h b/includes/stdarg.h index 47ca476..90bc848 100644 --- a/includes/stdarg.h +++ b/includes/stdarg.h @@ -1,4 +1,4 @@ -/* Variable arguments +/* Variable arguments This file is part of the Public Domain C Library (PDCLib). Permission is granted to use, modify, and / or redistribute at will. @@ -17,4 +17,3 @@ typedef _PDCLIB_va_list va_list; #define va_start( ap, parmN ) _PDCLIB_va_start( ap, parmN ) #endif - diff --git a/includes/stdbool.h b/includes/stdbool.h index 25dc513..8f6a1d0 100644 --- a/includes/stdbool.h +++ b/includes/stdbool.h @@ -13,4 +13,3 @@ #define __bool_true_false_are_defined 1 #endif - diff --git a/includes/stddef.h b/includes/stddef.h index 7113421..970f1dd 100644 --- a/includes/stddef.h +++ b/includes/stddef.h @@ -26,4 +26,3 @@ typedef _PDCLIB_wchar_t wchar_t; #define offsetof( type, member ) _PDCLIB_offsetof( type, member ) #endif - diff --git a/includes/stdint.h b/includes/stdint.h index a1c3942..5d387d9 100644 --- a/includes/stdint.h +++ b/includes/stdint.h @@ -205,4 +205,3 @@ typedef _PDCLIB_uintmax_t uintmax_t; #endif #endif - diff --git a/includes/stdio.h b/includes/stdio.h index af93c4c..3363eee 100644 --- a/includes/stdio.h +++ b/includes/stdio.h @@ -54,7 +54,7 @@ extern FILE * stderr; int remove( const char * filename ); /* Rename the given old file to the given new name. - Returns zero if successful, non-zero otherwise. + Returns zero if successful, non-zero otherwise. This implementation does detect if the old filename corresponds to an open file, and fails the rename in this case. If there already is a file with the new filename, behaviour is defined by diff --git a/includes/stdlib.h b/includes/stdlib.h index b753897..97c85e0 100644 --- a/includes/stdlib.h +++ b/includes/stdlib.h @@ -143,7 +143,7 @@ void abort( void ); reverse order of registration (last-in, first-out). Returns zero if registration is successfull, nonzero if it failed. */ -int atexit( void (*func)( void ) ); +int atexit( void (*func)( void ) ); /* Normal process termination. Functions registered by atexit() (see above) are called, streams flushed, files closed and temporary files removed before the diff --git a/internals/_PDCLIB_glue.h b/internals/_PDCLIB_glue.h index 534322b..cce59e7 100644 --- a/internals/_PDCLIB_glue.h +++ b/internals/_PDCLIB_glue.h @@ -33,7 +33,7 @@ void * _PDCLIB_allocpages( int n ); /* stdio.h */ -/* A system call that opens a file identified by name in a given mode. Return +/* A system call that opens a file identified by name in a given mode. Return a file descriptor uniquely identifying that file. (The mode is the return value of the _PDCLIB_filemode() function.) */ diff --git a/internals/_PDCLIB_int.h b/internals/_PDCLIB_int.h index e997b08..e449e2d 100644 --- a/internals/_PDCLIB_int.h +++ b/internals/_PDCLIB_int.h @@ -257,7 +257,7 @@ typedef unsigned _PDCLIB_intmax _PDCLIB_uintmax_t; */ #define _PDCLIB_FREAD 8u #define _PDCLIB_FWRITE 16u -#define _PDCLIB_FAPPEND 32u +#define _PDCLIB_FAPPEND 32u #define _PDCLIB_FRW 64u #define _PDCLIB_FBIN 128u @@ -380,7 +380,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) /* Parsing any fopen() style filemode string into a number of flags. */ unsigned int _PDCLIB_filemode( const char * mode ); -/* Sanity checking and preparing of read buffer, should be called first thing +/* Sanity checking and preparing of read buffer, should be called first thing by any stdio read-data function. Returns 0 on success, EOF on error. On error, EOF / error flags and errno are set appropriately. diff --git a/platform/example/Readme.txt b/platform/example/Readme.txt index 5cb83b5..07dc20e 100644 --- a/platform/example/Readme.txt +++ b/platform/example/Readme.txt @@ -19,4 +19,3 @@ order to experience anything but abysmal performance: platform of choice, it is also highly inefficient and should be replaced by inline assembly. Just make sure that your assembly keeps all the promises the C library makes. - diff --git a/platform/example/functions/_PDCLIB/_Exit.c b/platform/example/functions/_PDCLIB/_Exit.c index e9e900d..ed019ae 100644 --- a/platform/example/functions/_PDCLIB/_Exit.c +++ b/platform/example/functions/_PDCLIB/_Exit.c @@ -11,6 +11,7 @@ #include #ifndef REGTEST + #include "_PDCLIB_glue.h" extern void _exit( int status ) _PDCLIB_NORETURN; @@ -23,6 +24,7 @@ void _PDCLIB_Exit( int status ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/platform/example/functions/_PDCLIB/allocpages.c b/platform/example/functions/_PDCLIB/allocpages.c index f3414bb..9de9314 100644 --- a/platform/example/functions/_PDCLIB/allocpages.c +++ b/platform/example/functions/_PDCLIB/allocpages.c @@ -58,6 +58,7 @@ void * _PDCLIB_allocpages( int const n ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/platform/example/functions/_PDCLIB/close.c b/platform/example/functions/_PDCLIB/close.c index 279fae8..8fc9b34 100644 --- a/platform/example/functions/_PDCLIB/close.c +++ b/platform/example/functions/_PDCLIB/close.c @@ -11,6 +11,7 @@ #include #ifndef REGTEST + #include "_PDCLIB_glue.h" extern int close( int fd ); @@ -23,6 +24,7 @@ int _PDCLIB_close( int fd ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/platform/example/functions/_PDCLIB/fillbuffer.c b/platform/example/functions/_PDCLIB/fillbuffer.c index e3cb9be..0e1b0e3 100644 --- a/platform/example/functions/_PDCLIB/fillbuffer.c +++ b/platform/example/functions/_PDCLIB/fillbuffer.c @@ -11,6 +11,7 @@ #include #ifndef REGTEST + #include "_PDCLIB_glue.h" #include @@ -65,6 +66,7 @@ int _PDCLIB_fillbuffer( struct _PDCLIB_file_t * stream ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -74,4 +76,3 @@ int main( void ) } #endif - diff --git a/platform/example/functions/_PDCLIB/flushbuffer.c b/platform/example/functions/_PDCLIB/flushbuffer.c index 8d5f921..3ed891f 100644 --- a/platform/example/functions/_PDCLIB/flushbuffer.c +++ b/platform/example/functions/_PDCLIB/flushbuffer.c @@ -12,6 +12,7 @@ #include #ifndef REGTEST + #include "_PDCLIB_glue.h" #include @@ -95,8 +96,8 @@ int _PDCLIB_flushbuffer( struct _PDCLIB_file_t * stream ) #endif - #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -106,4 +107,3 @@ int main( void ) } #endif - diff --git a/platform/example/functions/_PDCLIB/open.c b/platform/example/functions/_PDCLIB/open.c index 1e2c775..0f9d08c 100644 --- a/platform/example/functions/_PDCLIB/open.c +++ b/platform/example/functions/_PDCLIB/open.c @@ -11,6 +11,7 @@ #include #ifndef REGTEST + #include "_PDCLIB_glue.h" #include @@ -95,6 +96,7 @@ int _PDCLIB_open( char const * const filename, unsigned int mode ) #endif #ifdef TEST + #include "_PDCLIB_test.h" #include @@ -163,4 +165,3 @@ int main( void ) } #endif - diff --git a/platform/example/functions/_PDCLIB/rename.c b/platform/example/functions/_PDCLIB/rename.c index 6ce4581..f1fc382 100644 --- a/platform/example/functions/_PDCLIB/rename.c +++ b/platform/example/functions/_PDCLIB/rename.c @@ -7,6 +7,7 @@ #include #ifndef REGTEST + #include "_PDCLIB_glue.h" #include diff --git a/platform/example/functions/_PDCLIB/seek.c b/platform/example/functions/_PDCLIB/seek.c index 3d62c59..cafcee8 100644 --- a/platform/example/functions/_PDCLIB/seek.c +++ b/platform/example/functions/_PDCLIB/seek.c @@ -60,6 +60,7 @@ _PDCLIB_int64_t _PDCLIB_seek( struct _PDCLIB_file_t * stream, _PDCLIB_int64_t of #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -69,4 +70,3 @@ int main( void ) } #endif - diff --git a/platform/example/functions/_PDCLIB/stdinit.c b/platform/example/functions/_PDCLIB/stdinit.c index d11718d..d7a0c84 100644 --- a/platform/example/functions/_PDCLIB/stdinit.c +++ b/platform/example/functions/_PDCLIB/stdinit.c @@ -302,7 +302,7 @@ static struct _PDCLIB_ctype_t _ctype[] = { { 0x00, 0xFF, 0xFF, 0xFF } }; -struct lconv _PDCLIB_lconv = { +struct lconv _PDCLIB_lconv = { /* _PDCLIB_ctype */ _ctype + 1, /* _PDCLIB_errno_texts */ { @@ -340,11 +340,12 @@ struct lconv _PDCLIB_lconv = { #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) { - /* Testing covered by several other testdrivers using stdin / stdout / + /* Testing covered by several other testdrivers using stdin / stdout / stderr. */ return TEST_RESULTS; diff --git a/platform/example/functions/signal/raise.c b/platform/example/functions/signal/raise.c index 13a8b50..7071092 100644 --- a/platform/example/functions/signal/raise.c +++ b/platform/example/functions/signal/raise.c @@ -68,6 +68,7 @@ int raise( int sig ) #endif #ifdef TEST + #include "_PDCLIB_test.h" #include @@ -109,4 +110,5 @@ int main( void ) TESTCASE( flag == 1 ); return TEST_RESULTS; } + #endif diff --git a/platform/example/functions/signal/signal.c b/platform/example/functions/signal/signal.c index f8fce3c..e6775e7 100644 --- a/platform/example/functions/signal/signal.c +++ b/platform/example/functions/signal/signal.c @@ -63,6 +63,7 @@ void (*signal( int sig, void (*func)( int ) ) )( int ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -70,4 +71,5 @@ int main( void ) /* Testing covered by raise.c */ return TEST_RESULTS; } + #endif diff --git a/platform/example/functions/stdio/remove.c b/platform/example/functions/stdio/remove.c index a2279f1..aca3eaf 100644 --- a/platform/example/functions/stdio/remove.c +++ b/platform/example/functions/stdio/remove.c @@ -63,6 +63,7 @@ int remove( const char * pathname ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) @@ -72,4 +73,3 @@ int main( void ) } #endif - diff --git a/platform/example/functions/stdio/tmpfile.c b/platform/example/functions/stdio/tmpfile.c index 432e3b9..cb942ff 100644 --- a/platform/example/functions/stdio/tmpfile.c +++ b/platform/example/functions/stdio/tmpfile.c @@ -8,12 +8,12 @@ #ifndef REGTEST +#include "_PDCLIB_glue.h" + #include #include #include -#include "_PDCLIB_glue.h" - #include #include #include @@ -47,7 +47,7 @@ struct _PDCLIB_file_t * tmpfile( void ) generate the filename candidate, which is *also* platform-dependent. */ unsigned int random; - fscanf( randomsource, "%u", &random ); + fscanf( randomsource, "%u", &random ); sprintf( filename, "/tmp/%u.tmp", random ); /* Check if file of this name exists. Note that fopen() is a very weak check, which does not take e.g. access permissions into account @@ -86,7 +86,9 @@ struct _PDCLIB_file_t * tmpfile( void ) #endif #ifdef TEST + #include "_PDCLIB_test.h" + #include int main( void ) @@ -110,4 +112,3 @@ int main( void ) } #endif - diff --git a/platform/example/functions/stdlib/getenv.c b/platform/example/functions/stdlib/getenv.c index 30ed1de..72bbcd2 100644 --- a/platform/example/functions/stdlib/getenv.c +++ b/platform/example/functions/stdlib/getenv.c @@ -32,6 +32,7 @@ char * getenv( const char * name ) #endif #ifdef TEST + #include "_PDCLIB_test.h" int main( void ) diff --git a/platform/example/functions/stdlib/system.c b/platform/example/functions/stdlib/system.c index 6f4aded..8b5d4d7 100644 --- a/platform/example/functions/stdlib/system.c +++ b/platform/example/functions/stdlib/system.c @@ -32,6 +32,7 @@ int system( const char * string ) } #ifdef TEST + #include "_PDCLIB_test.h" #define SHELLCOMMAND "echo 'SUCCESS testing system()'" diff --git a/platform/example/includes/signal.h b/platform/example/includes/signal.h index 9d59d96..bd57959 100644 --- a/platform/example/includes/signal.h +++ b/platform/example/includes/signal.h @@ -82,4 +82,3 @@ void (*signal( int sig, void (*func)( int ) ) )( int ); int raise( int sig ); #endif - diff --git a/platform/example/internals/_PDCLIB_config.h b/platform/example/internals/_PDCLIB_config.h index 0717adb..e9cde3c 100644 --- a/platform/example/internals/_PDCLIB_config.h +++ b/platform/example/internals/_PDCLIB_config.h @@ -145,7 +145,7 @@ struct _PDCLIB_lldiv_t /* Large enough an integer to hold all character codes of the largest supported locale. */ -#define _PDCLIB_wchar unsigned short +#define _PDCLIB_wchar unsigned short #define _PDCLIB_WCHAR USHRT /* (Signed) integer type capable of taking the (cast) value of a void *, and diff --git a/testing/_PDCLIB_test.h b/testing/_PDCLIB_test.h index 7878ddb..62f5fb5 100644 --- a/testing/_PDCLIB_test.h +++ b/testing/_PDCLIB_test.h @@ -42,4 +42,3 @@ static int TEST_RESULTS = 0; #if defined( _PDCLIB_FILEIO ) || defined( _PDCLIB_STRINGIO ) #include "_PDCLIB_iotest.h" #endif - diff --git a/testing/printf_testcases.h b/testing/printf_testcases.h index e024784..461b939 100644 --- a/testing/printf_testcases.h +++ b/testing/printf_testcases.h @@ -1,4 +1,4 @@ - { +{ PRINTF_TEST( 4, "-128", "%hhd", CHAR_MIN ); PRINTF_TEST( 3, "127", "%hhd", CHAR_MAX ); PRINTF_TEST( 1, "0", "%hhd", 0 ); @@ -113,4 +113,4 @@ TESTCASE( val2 == 9 ); } #endif - } +} -- 2.40.0