i - pointer to number of characters already delivered in this call
n - pointer to maximum number of characters to be delivered in this call
s - the buffer into which the character shall be delivered
- TODO: ref. fputs() for a better way to buffer handling
*/
-#define DELIVER( x ) \
+#define PUT( x ) \
do { \
int character = x; \
if ( status->i < status->n ) { \
{
for ( size_t i = 0; i < status->width - characters; ++i )
{
- DELIVER( ' ' );
+ PUT( ' ' );
++(status->current);
}
}
preidx = 0;
while ( preface[ preidx ] != '\0' )
{
- DELIVER( preface[ preidx++ ] );
+ PUT( preface[ preidx++ ] );
++(status->current);
}
if ( ( ! ( status->flags & E_minus ) ) && ( status->flags & E_zero ) )
*/
while ( status->current < status->width )
{
- DELIVER( '0' );
+ PUT( '0' );
++(status->current);
}
}
/* Do the precision padding if necessary. */
for ( size_t i = 0; i < prec_pads; ++i )
{
- DELIVER( '0' );
+ PUT( '0' );
}
}
}
if ( status->flags & E_lower )
{
/* Lowercase letters. Same array used for strto...(). */
- DELIVER( _PDCLIB_digits[ digit ] );
+ PUT( _PDCLIB_digits[ digit ] );
}
else
{
/* Uppercase letters. Array only used here, only 0-F. */
- DELIVER( _PDCLIB_Xdigits[ digit ] );
+ PUT( _PDCLIB_Xdigits[ digit ] );
}
}
}
if ( *(++spec) == '%' )
{
/* %% -> print single '%' */
- DELIVER( *spec );
+ PUT( *spec );
return ++spec;
}
/* Initializing status structure */
break;
case 'c':
/* TODO: Flags, wide chars. */
- DELIVER( va_arg( status->arg, int ) );
+ PUT( va_arg( status->arg, int ) );
return ++spec;
case 's':
/* TODO: Flags, wide chars. */
char * s = va_arg( status->arg, char * );
while ( *s != '\0' )
{
- DELIVER( *(s++) );
+ PUT( *(s++) );
}
return ++spec;
}
}
if ( status->flags & E_lower )
{
- DELIVER( _PDCLIB_digits[ digit ] );
+ PUT( _PDCLIB_digits[ digit ] );
}
else
{
- DELIVER( _PDCLIB_Xdigits[ digit ] );
+ PUT( _PDCLIB_Xdigits[ digit ] );
}
}
else
{
while ( status->current < status->width )
{
- DELIVER( ' ' );
+ PUT( ' ' );
++(status->current);
}
}
}
#ifdef TEST
-#include <_PDCLIB_test.h>
+#define _PDCLIB_FILEID "_PDCLIB/print.c"
+#define _PDCLIB_STRINGIO
-#include <limits.h>
-#include <string.h>
+#include <_PDCLIB_test.h>
static int testprintf( char * buffer, const char * format, ... )
{
#define TEST_CONVERSION_ONLY
-#define TESTCASE_SPRINTF( x ) if ( strcmp( target, x ) == 0 ) {} \
- else { TEST_RESULTS += 1; printf( "FAILED: " __FILE__ ", line %d - \"%s\" != %s\n", __LINE__, target, #x ); }
-
int main( void )
{
char target[100];
-#include "printf_testcases.incl"
+#include "printf_testcases.h"
return TEST_RESULTS;
}