X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;ds=sidebyside;f=functions%2Fstdio%2Fvsscanf.c;h=3fc09cf3cdb2c04b1eef171f704e7e4657b4c2e1;hb=3c60673fd7479218b6f8069b848a1f5c2bd10114;hp=fd35889ab4d200ead2782f2a1e732c9b76fc97a7;hpb=5522316811fdce2216c4d1320af68dd54909aed5;p=pdclib diff --git a/functions/stdio/vsscanf.c b/functions/stdio/vsscanf.c index fd35889..3fc09cf 100644 --- a/functions/stdio/vsscanf.c +++ b/functions/stdio/vsscanf.c @@ -14,17 +14,19 @@ int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict format, va_list arg ) { + /* TODO: This function should interpret format as multibyte characters. */ struct _PDCLIB_status_t status; status.base = 0; status.flags = 0; - status.n = 0; + status.n = 0; status.i = 0; - status.this = 0; - status.s = (char *)s; + status.current = 0; + status.s = (char *) s; status.width = 0; status.prec = 0; status.stream = NULL; va_copy( status.arg, arg ); + while ( *format != '\0' ) { const char * rc; @@ -62,11 +64,6 @@ int vsscanf( const char * _PDCLIB_restrict s, const char * _PDCLIB_restrict form /* NULL return code indicates input error */ if ( rc == NULL ) { - if ( status.n == 0 ) - { - /* input error before any conversion returns EOF */ - status.n = EOF; - } break; } /* Continue parsing after conversion specifier */