From 6089d8ab77f6f7bacbfa6354e8cfecab1b00c8bc Mon Sep 17 00:00:00 2001 From: solar Date: Fri, 14 May 2010 04:17:25 +0000 Subject: [PATCH] Renamed status->this to status->current to allow for use with C++ compilers. --- functions/_PDCLIB/print.c | 26 +++++++++++++------------- functions/_PDCLIB/scan.c | 18 +++++++++--------- functions/stdio/vfprintf.c | 4 ++-- functions/stdio/vfscanf.c | 2 +- functions/stdio/vsnprintf.c | 4 ++-- internals/_PDCLIB_int.h | 20 ++++++++++---------- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/functions/_PDCLIB/print.c b/functions/_PDCLIB/print.c index c36b009..e131cbb 100644 --- a/functions/_PDCLIB/print.c +++ b/functions/_PDCLIB/print.c @@ -67,7 +67,7 @@ static void int2base( intmax_t value, struct _PDCLIB_status_t * status ) already so it will be taken into account when the deepestmost recursion does the prefix / padding stuff. */ - ++(status->this); + ++(status->current); if ( ( value / status->base ) != 0 ) { /* More digits to be done - recurse deeper */ @@ -110,7 +110,7 @@ static void int2base( intmax_t value, struct _PDCLIB_status_t * status ) } } { - size_t prec_pads = ( status->prec > status->this ) ? ( status->prec - status->this ) : 0; + size_t prec_pads = ( status->prec > status->current ) ? ( status->prec - status->current ) : 0; if ( ! ( status->flags & ( E_minus | E_zero ) ) ) { /* Space padding is only done if no zero padding or left alignment @@ -121,7 +121,7 @@ static void int2base( intmax_t value, struct _PDCLIB_status_t * status ) I've ever perpetrated. Greetings to Samface, DevL, and all sceners at Breakpoint 2006. */ - size_t characters = preidx + ( ( status->this > status->prec ) ? status->this : status->prec ); + size_t characters = preidx + ( ( status->current > status->prec ) ? status->current : status->prec ); if ( status->width > characters ) { for ( size_t i = 0; i < status->width - characters; ++i ) @@ -147,7 +147,7 @@ static void int2base( intmax_t value, struct _PDCLIB_status_t * status ) ++(status->i); } while ( 0 ); */ - ++(status->this); + ++(status->current); } } } @@ -156,17 +156,17 @@ static void int2base( intmax_t value, struct _PDCLIB_status_t * status ) while ( preface[ preidx ] != '\0' ) { DELIVER( preface[ preidx++ ] ); - ++(status->this); + ++(status->current); } if ( ( ! ( status->flags & E_minus ) ) && ( status->flags & E_zero ) ) { /* If field is not left aligned, and zero padding is requested, do so. */ - while ( status->this < status->width ) + while ( status->current < status->width ) { DELIVER( '0' ); - ++(status->this); + ++(status->current); } } /* Do the precision padding if necessary. */ @@ -208,7 +208,7 @@ const char * _PDCLIB_print( const char * spec, struct _PDCLIB_status_t * status /* Initializing status structure */ status->flags = 0; status->base = 0; - status->this = 0; + status->current = 0; status->width = 0; status->prec = 0; @@ -458,7 +458,7 @@ const char * _PDCLIB_print( const char * spec, struct _PDCLIB_status_t * status value = (uintmax_t)va_arg( status->arg, size_t ); break; } - ++(status->this); + ++(status->current); if ( ( value / status->base ) != 0 ) { int2base( (intmax_t)(value / status->base), status ); @@ -506,10 +506,10 @@ const char * _PDCLIB_print( const char * spec, struct _PDCLIB_status_t * status } if ( status->flags & E_minus ) { - while ( status->this < status->width ) + while ( status->current < status->width ) { DELIVER( ' ' ); - ++(status->this); + ++(status->current); } } if ( status->i >= status->n ) @@ -528,13 +528,13 @@ const char * _PDCLIB_print( const char * spec, struct _PDCLIB_status_t * status static int testprintf( char * buffer, size_t n, const char * format, ... ) { - /* Members: base, flags, n, i, this, s, width, prec, stream, arg */ + /* Members: base, flags, n, i, current, s, width, prec, stream, arg */ struct _PDCLIB_status_t status; status.base = 0; status.flags = 0; status.n = n; status.i = 0; - status.this = 0; + status.current = 0; status.s = buffer; status.width = 0; status.prec = 0; diff --git a/functions/_PDCLIB/scan.c b/functions/_PDCLIB/scan.c index 8aaabfb..ce1dac7 100644 --- a/functions/_PDCLIB/scan.c +++ b/functions/_PDCLIB/scan.c @@ -63,7 +63,7 @@ static int GET( struct _PDCLIB_status_t * status ) if ( rc != EOF ) { ++(status->i); - ++(status->this); + ++(status->current); } return rc; } @@ -83,7 +83,7 @@ static void UNGET( int c, struct _PDCLIB_status_t * status ) --(status->s); } --(status->i); - --(status->this); + --(status->current); } @@ -153,7 +153,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) /* Initializing status structure */ status->flags = 0; status->base = -1; - status->this = 0; + status->current = 0; status->width = 0; status->prec = 0; @@ -272,7 +272,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) status->width = 1; } /* reading until width reached or input exhausted */ - while ( ( status->this < status->width ) && + while ( ( status->current < status->width ) && ( ( rc = GET( status ) ) != EOF ) ) { *(c++) = rc; @@ -297,7 +297,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) case 's': { char * c = va_arg( status->arg, char * ); - while ( ( status->this < status->width ) && + while ( ( status->current < status->width ) && ( ( rc = GET( status ) ) != EOF ) ) { if ( isspace( rc ) ) @@ -357,7 +357,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) } while ( *endspec != ']' ); // read according to scanlist, equiv. to %s above char * c = va_arg( status->arg, char * ); - while ( ( status->this < status->width ) && + while ( ( status->current < status->width ) && ( ( rc = GET( status ) ) != EOF ) ) { if ( negative_scanlist ) @@ -415,7 +415,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) uintmax_t value = 0; /* absolute value read */ bool prefix_parsed = false; int sign = 0; - while ( ( status->this < status->width ) && + while ( ( status->current < status->width ) && ( ( rc = GET( status ) ) != EOF ) ) { if ( isspace( rc ) ) @@ -429,7 +429,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) else { /* leading whitespace not counted against width */ - status->this--; + status->current--; } } else if ( ! sign ) @@ -467,7 +467,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status ) { /* starts with zero, so it might be a prefix. */ /* check what follows next (might be 0x...) */ - if ( ( status->this < status->width ) && + if ( ( status->current < status->width ) && ( ( rc = GET( status ) ) != EOF ) ) { if ( tolower( rc ) == 'x' ) diff --git a/functions/stdio/vfprintf.c b/functions/stdio/vfprintf.c index 3390533..626ad51 100644 --- a/functions/stdio/vfprintf.c +++ b/functions/stdio/vfprintf.c @@ -15,13 +15,13 @@ int vfprintf( struct _PDCLIB_file_t * _PDCLIB_restrict stream, const char * _PDCLIB_restrict format, va_list arg ) { /* TODO: This function should interpret format as multibyte characters. */ - /* Members: base, flags, n, i, this, s, width, prec, stream, arg */ + /* Members: base, flags, n, i, current, s, width, prec, stream, arg */ struct _PDCLIB_status_t status; status.base = 0; status.flags = 0; status.n = SIZE_MAX; status.i = 0; - status.this = 0; + status.current = 0; status.s = NULL; status.width = 0; status.prec = 0; diff --git a/functions/stdio/vfscanf.c b/functions/stdio/vfscanf.c index f5b1f3f..8b3a8f7 100644 --- a/functions/stdio/vfscanf.c +++ b/functions/stdio/vfscanf.c @@ -19,7 +19,7 @@ int vfscanf( FILE * _PDCLIB_restrict stream, const char * _PDCLIB_restrict forma status.flags = 0; status.n = 0; status.i = 0; - status.this = 0; + status.current = 0; status.s = NULL; status.width = 0; status.prec = 0; diff --git a/functions/stdio/vsnprintf.c b/functions/stdio/vsnprintf.c index 21e76b1..4dbd7c2 100644 --- a/functions/stdio/vsnprintf.c +++ b/functions/stdio/vsnprintf.c @@ -14,13 +14,13 @@ int vsnprintf( char * _PDCLIB_restrict s, size_t n, const char * _PDCLIB_restrict format, _PDCLIB_va_list arg ) { /* TODO: This function should interpret format as multibyte characters. */ - /* Members: base, flags, n, i, this, s, width, prec, stream, arg */ + /* Members: base, flags, n, i, current, s, width, prec, stream, arg */ struct _PDCLIB_status_t status; status.base = 0; status.flags = 0; status.n = n; status.i = 0; - status.this = 0; + status.current = 0; status.s = s; status.width = 0; status.prec = 0; diff --git a/internals/_PDCLIB_int.h b/internals/_PDCLIB_int.h index a950cf2..b5ac49e 100644 --- a/internals/_PDCLIB_int.h +++ b/internals/_PDCLIB_int.h @@ -315,18 +315,18 @@ struct _PDCLIB_memnode_t /* Status structure required by _PDCLIB_print(). */ struct _PDCLIB_status_t { - int base; /* base to which the value shall be converted */ + int base; /* base to which the value shall be converted */ _PDCLIB_int_fast32_t flags; /* flags and length modifiers */ - _PDCLIB_size_t n; /* print: maximum characters to be written */ - /* scan: number matched conversion specifiers */ - _PDCLIB_size_t i; /* number of characters read/written */ - _PDCLIB_size_t this; /* chars read/written in the CURRENT conversion */ - char * s; /* *sprintf(): target buffer */ - /* *sscanf(): source string */ - _PDCLIB_size_t width; /* specified field width */ - _PDCLIB_size_t prec; /* specified field precision */ + _PDCLIB_size_t n; /* print: maximum characters to be written */ + /* scan: number matched conversion specifiers */ + _PDCLIB_size_t i; /* number of characters read/written */ + _PDCLIB_size_t current;/* chars read/written in the CURRENT conversion */ + char * s; /* *sprintf(): target buffer */ + /* *sscanf(): source string */ + _PDCLIB_size_t width; /* specified field width */ + _PDCLIB_size_t prec; /* specified field precision */ struct _PDCLIB_file_t * stream; /* *fprintf() / *fscanf() stream */ - _PDCLIB_va_list arg; /* argument stack */ + _PDCLIB_va_list arg; /* argument stack */ }; /* -------------------------------------------------------------------------- */ -- 2.40.0