X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2F_PDCLIB%2Fscan.c;h=7e6c42c4c53c12e2d1e22e1a98b38b73508e05c1;hb=b43055b06b74c0a45128531e4f18bef0c5a49efc;hp=6bef32ec54ceb6b56cb6a27dc4419ec5248fa870;hpb=bdad1f82d0c0aa0b83e8b195303d7957c578da2e;p=pdclib

diff --git a/functions/_PDCLIB/scan.c b/functions/_PDCLIB/scan.c
index 6bef32e..7e6c42c 100644
--- a/functions/_PDCLIB/scan.c
+++ b/functions/_PDCLIB/scan.c
@@ -16,6 +16,8 @@
 #include <stddef.h>
 #include <limits.h>
 
+#ifndef REGTEST
+
 /* Using an integer's bits as flags for both the conversion flags and length
    modifiers.
 */
@@ -39,7 +41,7 @@
 */
 static int GET( struct _PDCLIB_status_t * status )
 {
-    int rc;
+    int rc = EOF;
     if ( status->stream != NULL )
     {
         rc = getc( status->stream );
@@ -160,7 +162,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status )
     status->width = (int)strtol( spec, (char**)&spec, 10 );
     if ( spec == prev_spec )
     {
-        status->width = SIZE_MAX;
+        status->width = INT_MAX;
     }
 
     /* Optional length modifier
@@ -519,73 +521,76 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status )
             return NULL;
         }
         /* convert value to target type and assign to parameter */
-        switch ( status->flags & ( E_char | E_short | E_long | E_llong |
-                                   E_intmax | E_size | E_ptrdiff |
-                                   E_unsigned ) )
+        if ( ! ( status->flags & E_suppressed ) )
         {
-            case E_char:
-                *( va_arg( status->arg,               char * ) ) =               (char)( value * sign );
-                break;
-            case E_char | E_unsigned:
-                *( va_arg( status->arg,      unsigned char * ) ) =      (unsigned char)( value * sign );
-                break;
+            switch ( status->flags & ( E_char | E_short | E_long | E_llong |
+                                       E_intmax | E_size | E_ptrdiff |
+                                       E_unsigned ) )
+            {
+                case E_char:
+                    *( va_arg( status->arg,               char * ) ) =               (char)( value * sign );
+                    break;
+                case E_char | E_unsigned:
+                    *( va_arg( status->arg,      unsigned char * ) ) =      (unsigned char)( value * sign );
+                    break;
 
-            case E_short:
-                *( va_arg( status->arg,              short * ) ) =              (short)( value * sign );
-                break;
-            case E_short | E_unsigned:
-                *( va_arg( status->arg,     unsigned short * ) ) =     (unsigned short)( value * sign );
-                break;
+                case E_short:
+                    *( va_arg( status->arg,              short * ) ) =              (short)( value * sign );
+                    break;
+                case E_short | E_unsigned:
+                    *( va_arg( status->arg,     unsigned short * ) ) =     (unsigned short)( value * sign );
+                    break;
 
-            case 0:
-                *( va_arg( status->arg,                int * ) ) =                (int)( value * sign );
-                break;
-            case E_unsigned:
-                *( va_arg( status->arg,       unsigned int * ) ) =       (unsigned int)( value * sign );
-                break;
+                case 0:
+                    *( va_arg( status->arg,                int * ) ) =                (int)( value * sign );
+                    break;
+                case E_unsigned:
+                    *( va_arg( status->arg,       unsigned int * ) ) =       (unsigned int)( value * sign );
+                    break;
 
-            case E_long:
-                *( va_arg( status->arg,               long * ) ) =               (long)( value * sign );
-                break;
-            case E_long | E_unsigned:
-                *( va_arg( status->arg,      unsigned long * ) ) =      (unsigned long)( value * sign );
-                break;
+                case E_long:
+                    *( va_arg( status->arg,               long * ) ) =               (long)( value * sign );
+                    break;
+                case E_long | E_unsigned:
+                    *( va_arg( status->arg,      unsigned long * ) ) =      (unsigned long)( value * sign );
+                    break;
 
-            case E_llong:
-                *( va_arg( status->arg,          long long * ) ) =          (long long)( value * sign );
-                break;
-            case E_llong | E_unsigned:
-                *( va_arg( status->arg, unsigned long long * ) ) = (unsigned long long)( value * sign );
-                break;
+                case E_llong:
+                    *( va_arg( status->arg,          long long * ) ) =          (long long)( value * sign );
+                    break;
+                case E_llong | E_unsigned:
+                    *( va_arg( status->arg, unsigned long long * ) ) = (unsigned long long)( value * sign );
+                    break;
 
-            case E_intmax:
-                *( va_arg( status->arg,           intmax_t * ) ) =           (intmax_t)( value * sign );
-                break;
-            case E_intmax | E_unsigned:
-                *( va_arg( status->arg,          uintmax_t * ) ) =          (uintmax_t)( value * sign );
-                break;
+                case E_intmax:
+                    *( va_arg( status->arg,           intmax_t * ) ) =           (intmax_t)( value * sign );
+                    break;
+                case E_intmax | E_unsigned:
+                    *( va_arg( status->arg,          uintmax_t * ) ) =          (uintmax_t)( value * sign );
+                    break;
 
-            case E_size:
-                /* E_size always implies unsigned */
-                *( va_arg( status->arg,             size_t * ) ) =             (size_t)( value * sign );
-                break;
+                case E_size:
+                    /* E_size always implies unsigned */
+                    *( va_arg( status->arg,             size_t * ) ) =             (size_t)( value * sign );
+                    break;
 
-            case E_ptrdiff:
-                /* E_ptrdiff always implies signed */
-                *( va_arg( status->arg,          ptrdiff_t * ) ) =          (ptrdiff_t)( value * sign );
-                break;
+                case E_ptrdiff:
+                    /* E_ptrdiff always implies signed */
+                    *( va_arg( status->arg,          ptrdiff_t * ) ) =          (ptrdiff_t)( value * sign );
+                    break;
 
-            default:
-                puts( "UNSUPPORTED SCANF FLAG COMBINATION" );
-                return NULL; /* behaviour unspecified */
+                default:
+                    puts( "UNSUPPORTED SCANF FLAG COMBINATION" );
+                    return NULL; /* behaviour unspecified */
+            }
+            ++(status->n);
         }
-        ++(status->n);
         return ++spec;
     }
     /* TODO: Floats. */
     return NULL;
 }
-
+#endif
 
 #ifdef TEST
 #define _PDCLIB_FILEID "_PDCLIB/scan.c"
@@ -593,6 +598,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;
@@ -609,13 +615,16 @@ static int testscanf( char const * s, char const * format, ... )
     va_end( status.arg );
     return status.n;
 }
+#endif
 
 #define TEST_CONVERSION_ONLY
 
 int main( void )
 {
+#ifndef REGTEST
     char source[100];
 #include "scanf_testcases.h"
+#endif
     return TEST_RESULTS;
 }