X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2F_PDCLIB%2Fscan.c;h=5d9d675601cc1b128dd3b6f8327cf07edc21ab49;hb=d6f1494a4f38a212b29a13ee713885058dcf0fe7;hp=15b1d503c32a5fa9481c48f65d625a08922508bb;hpb=31fdebd6d624ffce068548cb4d63f4ec583cec04;p=pdclib

diff --git a/functions/_PDCLIB/scan.c b/functions/_PDCLIB/scan.c
index 15b1d50..5d9d675 100644
--- a/functions/_PDCLIB/scan.c
+++ b/functions/_PDCLIB/scan.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* _PDCLIB_scan( const char *, struct _PDCLIB_status_t * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -27,7 +25,7 @@
 #define E_intmax     1<<10
 #define E_size       1<<11
 #define E_ptrdiff    1<<12
-#define E_intptr     1<<13
+#define E_pointer    1<<13
 #define E_ldouble    1<<14
 #define E_unsigned   1<<16
 
@@ -39,7 +37,7 @@
 */
 static int GET( struct _PDCLIB_status_t * status )
 {
-    int rc;
+    int rc = EOF;
     if ( status->stream != NULL )
     {
         rc = getc( status->stream );
@@ -285,7 +283,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status )
         case 's':
         {
             char * c = va_arg( status->arg, char * );
-            while ( ( status->current < status->width ) && 
+            while ( ( status->current < status->width ) &&
                     ( ( rc = GET( status ) ) != EOF ) )
             {
                 if ( isspace( rc ) )
@@ -345,7 +343,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->current < status->width ) && 
+            while ( ( status->current < status->width ) &&
                     ( ( rc = GET( status ) ) != EOF ) )
             {
                 if ( negative_scanlist )
@@ -384,7 +382,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status )
         }
         case 'p':
             status->base = 16;
-            status->flags |= E_unsigned;
+            status->flags |= E_pointer;
             break;
         case 'n':
         {
@@ -522,7 +520,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status )
         if ( ! ( status->flags & E_suppressed ) )
         {
             switch ( status->flags & ( E_char | E_short | E_long | E_llong |
-                                       E_intmax | E_size | E_ptrdiff |
+                                       E_intmax | E_size | E_ptrdiff | E_pointer |
                                        E_unsigned ) )
             {
                 case E_char:
@@ -577,6 +575,11 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status )
                     *( va_arg( status->arg,          ptrdiff_t * ) ) =          (ptrdiff_t)( value * sign );
                     break;
 
+                case E_pointer:
+                    /* E_pointer always implies unsigned */
+                    *( uintptr_t* )( va_arg( status->arg, void * ) ) =          (uintptr_t)( value * sign );
+                    break;
+
                 default:
                     puts( "UNSUPPORTED SCANF FLAG COMBINATION" );
                     return NULL; /* behaviour unspecified */
@@ -594,7 +597,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status )
 #define _PDCLIB_FILEID "_PDCLIB/scan.c"
 #define _PDCLIB_STRINGIO
 
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 
 static int testscanf( char const * s, char const * format, ... )
 {