X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=functions%2F_PDCLIB%2Fprint.c;h=41b3bd98afdaca2392f6da4fab2be6e96b4cad10;hb=87195dbaff9d4b3827dcf3f714662b64077ddb42;hp=d0476be857c470281de45c319c406b676aaed0aa;hpb=d10d1f564f83d66bee6d828f42f69b911e0cea7b;p=fw%2Fpdclib diff --git a/functions/_PDCLIB/print.c b/functions/_PDCLIB/print.c index d0476be..41b3bd9 100644 --- a/functions/_PDCLIB/print.c +++ b/functions/_PDCLIB/print.c @@ -259,7 +259,7 @@ const char * _PDCLIB_print( const char * spec, struct _PDCLIB_status_t * status if ( width < 0 ) { status->flags |= E_minus; - status->width = width * -1; /* FIXME: Should be abs( width ) */ + status->width = abs( width ); } else { @@ -536,15 +536,23 @@ static int testprintf( char * buffer, size_t n, const char * format, ... ) if ( *(_PDCLIB_print( format, &status )) != '\0' ) { printf( "_PDCLIB_print() did not return end-of-specifier on '%s'.\n", format ); - ++rc; + ++TEST_RESULTS; } va_end( status.arg ); return status.i; } +#define TEST_CONVERSION_ONLY + +#define TESTCASE_SPRINTF( x ) TESTCASE( x ) + int main( void ) { char buffer[100]; +#include "printf_testcases.incl" + +#if 0 + char buffer[100]; TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MIN ) == 4 ); TESTCASE( strcmp( buffer, "-128" ) == 0 ); TESTCASE( testprintf( buffer, 100, "%hhd", CHAR_MAX ) == 3 ); @@ -783,6 +791,7 @@ int main( void ) TESTCASE( strcmp( buffer, "abcdef" ) == 0 ); TESTCASE( testprintf( buffer, 100, "%p", (void *)0xdeadbeef ) == 10 ); TESTCASE( strcmp( buffer, "0xdeadbeef" ) == 0 ); +#endif return TEST_RESULTS; }