From a8f367a73f490043c0f0ac21a444d9f251f3e8cc Mon Sep 17 00:00:00 2001 From: solar Date: Wed, 1 Dec 2010 21:34:16 +0000 Subject: [PATCH] Some cleanups and corrected typos. git-svn-id: https://srv7.svn-repos.de/dev34/pdclib/trunk@472 546481bc-9713-0410-bf18-d3337bbf4a3e --- functions/stdio/fprintf.c | 1 - functions/stdio/printf.c | 1 - functions/stdio/vfprintf.c | 1 - functions/stdio/vprintf.c | 1 - platform/example/testing/printf_reference.txt | 1 - platform/example_64/testing/printf_reference.txt | 1 - testing/fprintf_reftest.incl | 12 ------------ testing/printf_testcases.incl | 4 ++-- 8 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 platform/example/testing/printf_reference.txt delete mode 100644 platform/example_64/testing/printf_reference.txt delete mode 100644 testing/fprintf_reftest.incl diff --git a/functions/stdio/fprintf.c b/functions/stdio/fprintf.c index b7bd43a..38fb9b8 100644 --- a/functions/stdio/fprintf.c +++ b/functions/stdio/fprintf.c @@ -39,7 +39,6 @@ int main( void ) TESTCASE( ( target = fopen( "testing/testfile", "wb+" ) ) != NULL ); #include "printf_testcases.incl" TESTCASE( fclose( target ) == 0 ); -#include "fprintf_reftest.incl" TESTCASE( remove( "testing/testfile" ) == 0 ); return TEST_RESULTS; } diff --git a/functions/stdio/printf.c b/functions/stdio/printf.c index 346dfcc..aa772ec 100644 --- a/functions/stdio/printf.c +++ b/functions/stdio/printf.c @@ -38,7 +38,6 @@ int main( void ) TESTCASE( ( target = freopen( testfile, "wb+", stdout ) ) != NULL ); #include "printf_testcases.incl" TESTCASE( fclose( target ) == 0 ); -#include "fprintf_reftest.incl" TESTCASE( remove( testfile ) == 0 ); return TEST_RESULTS; } diff --git a/functions/stdio/vfprintf.c b/functions/stdio/vfprintf.c index b5dacb4..7ab3167 100644 --- a/functions/stdio/vfprintf.c +++ b/functions/stdio/vfprintf.c @@ -72,7 +72,6 @@ int main( void ) TESTCASE( ( target = fopen( testfile, "wb+" ) ) != NULL ); #include "printf_testcases.incl" TESTCASE( fclose( target ) == 0 ); -#include "fprintf_reftest.incl" TESTCASE( remove( testfile ) == 0 ); return TEST_RESULTS; } diff --git a/functions/stdio/vprintf.c b/functions/stdio/vprintf.c index 55c37e4..4cb5af3 100644 --- a/functions/stdio/vprintf.c +++ b/functions/stdio/vprintf.c @@ -41,7 +41,6 @@ int main( void ) TESTCASE( ( target = freopen( testfile, "wb+", stdout ) ) != NULL ); #include "printf_testcases.incl" TESTCASE( fclose( target ) == 0 ); -#include "fprintf_reftest.incl" TESTCASE( remove( testfile ) == 0 ); return TEST_RESULTS; } diff --git a/platform/example/testing/printf_reference.txt b/platform/example/testing/printf_reference.txt deleted file mode 100644 index 6ba350a..0000000 --- a/platform/example/testing/printf_reference.txt +++ /dev/null @@ -1 +0,0 @@ --1281270-32768327670-214748364821474836470-214748364821474836470-922337203685477580892233720368547758070255255655356553542949672954294967295429496729542949672951844674407370955161518446744073709551615FFFFFFFF0XFFFFFFFFffffffff0xffffffff37777777777037777777777-2147483648+2147483647+042949672954294967295-2147483648 2147483647 042949672954294967295-21474836482147483647-21474836482147483647-2147483648 2147483647 -2147483648 2147483647-21474836482147483647-21474836482147483647-21474836482147483647 -2147483648 2147483647 -21474836482147483647-21474836482147483647-214748364802147483647-02147483648002147483647-21474836482147483647-21474836482147483647-21474836482147483647 -2147483648 2147483647 00000000002147483647ffffffff0xffffffff0xffffffff-2147483648-2147483648-21474836480xffffffff0xffffffff0xffffffff214748364721474836472147483647+2147483647+2147483647+2147483647+2147483647+2147483647+2147483647- 2147483647- 2147483647 % -2147483648xabcdef0xdeadbeef 0x1123456789 \ No newline at end of file diff --git a/platform/example_64/testing/printf_reference.txt b/platform/example_64/testing/printf_reference.txt deleted file mode 100644 index c3e1d86..0000000 --- a/platform/example_64/testing/printf_reference.txt +++ /dev/null @@ -1 +0,0 @@ --1281270-32768327670-214748364821474836470-922337203685477580892233720368547758070-92233720368547758089223372036854775807025525565535655354294967295429496729518446744073709551615184467440737095516151844674407370955161518446744073709551615FFFFFFFF0XFFFFFFFFffffffff0xffffffff37777777777037777777777%.0#o-2147483648+2147483647+042949672954294967295-2147483648 2147483647 042949672954294967295-21474836482147483647-21474836482147483647-2147483648 2147483647 -2147483648 2147483647-21474836482147483647-21474836482147483647-21474836482147483647 -2147483648 2147483647 -21474836482147483647-21474836482147483647-214748364802147483647-02147483648002147483647-21474836482147483647-21474836482147483647-21474836482147483647 -2147483648 2147483647 00000000002147483647ffffffff0xffffffff0xffffffff-2147483648-2147483648-21474836480xffffffff0xffffffff0xffffffff214748364721474836472147483647+2147483647+2147483647+2147483647+2147483647+2147483647+2147483647- 2147483647- 2147483647 % -2147483648xabcdef0xdeadbeef123456789 \ No newline at end of file diff --git a/testing/fprintf_reftest.incl b/testing/fprintf_reftest.incl deleted file mode 100644 index 3c6ae4b..0000000 --- a/testing/fprintf_reftest.incl +++ /dev/null @@ -1,12 +0,0 @@ - { - char readbuffer[2000]; - char refbuffer[2000]; - size_t readcounter; - TESTCASE( ( target = fopen( testfile, "r" ) ) != NULL ); - readcounter = fread( readbuffer, 1, 2000, target ); - TESTCASE( fclose( target ) == 0 ); - TESTCASE( ( target = fopen( "testing/printf_reference.txt", "r" ) ) != NULL ); - TESTCASE( fread( refbuffer, 1, 2000, target ) == readcounter ); - TESTCASE( fclose( target ) == 0 ); - TESTCASE( memcmp( readbuffer, refbuffer, readcounter ) == 0 ); - } diff --git a/testing/printf_testcases.incl b/testing/printf_testcases.incl index f6a44dc..2514540 100644 --- a/testing/printf_testcases.incl +++ b/testing/printf_testcases.incl @@ -203,7 +203,7 @@ PRINTF_TEST( INT_DIG + 1, "-" INT_MIN_DEZ_STR, "%-" INT_DIG_LESS1 "d", INT_MIN ); PRINTF_TEST( INT_DIG, INT_MAX_DEZ_STR, "%-" INT_DIG_LESS1 "d", INT_MAX ); PRINTF_TEST( INT_DIG + 1, "-" INT_MIN_DEZ_STR, "%-" sym2s(INT_DIG) "d", INT_MIN ); - PRINTF_TEST( INT_DIG, INT_MAX_DEZ_STR, "%-" sym2s(INT_DIG) "d", INT_MIN ); + PRINTF_TEST( INT_DIG, INT_MAX_DEZ_STR, "%-" sym2s(INT_DIG) "d", INT_MAX ); PRINTF_TEST( INT_DIG + 1, "-" INT_MIN_DEZ_STR, "%-" INT_DIG_PLUS1 "d", INT_MIN ); PRINTF_TEST( INT_DIG + 1, INT_MAX_DEZ_STR " ", "%-" INT_DIG_PLUS1 "d", INT_MAX ); PRINTF_TEST( INT_DIG + 2, "-" INT_MIN_DEZ_STR " ", "%-" INT_DIG_PLUS2 "d", INT_MIN ); @@ -246,7 +246,7 @@ PRINTF_TEST( INT_DIG + 1, "+" INT_MAX_DEZ_STR, "%+03.6d", INT_MAX ); #ifndef TEST_CONVERSION_ONLY PRINTF_TEST( INT_DIG + 2, "- " INT_MAX_DEZ_STR, "- %d", INT_MAX ); - PRINTF_TEST( INT_DIG * 2 + 6, "- " INT_MAX_DEZ_STR, " % -" INT_MIN_DEZ_STR, INT_MIN ); + PRINTF_TEST( INT_DIG * 2 + 6, "- " INT_MAX_DEZ_STR " % -" INT_MIN_DEZ_STR, "- %d %% %d", INT_MAX, INT_MIN ); #endif PRINTF_TEST( 1, "x", "%c", 'x' ); PRINTF_TEST( 6, "abcdef", "%s", "abcdef" ); -- 2.30.2