Renamed status->this to status->current to allow for use with C++ compilers.

[pdclib.old] / internals / _PDCLIB_int.h

diff --git a/internals/_PDCLIB_int.h b/internals/_PDCLIB_int.h
index 02e122eb3ada87dfa4f09e2a21712370a72bcadb..b5ac49e962eba1e048f4f21758fcb532e52fad0e 100644 (file)
--- a/internals/_PDCLIB_int.h
+++ b/internals/_PDCLIB_int.h
@@ -315,16 +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;     /* maximum number of characters to be written    */
-    _PDCLIB_size_t   i;     /* number of characters already written          */
-    _PDCLIB_size_t   this;  /* output chars in the current conversion        */
-    char *           s;     /* target buffer                                 */
-    _PDCLIB_size_t   width; /* width of current field                        */
-    _PDCLIB_size_t   prec;  /* precision of current field                    */
-    struct _PDCLIB_file_t * stream;/* for to-stream output                   */
-    _PDCLIB_va_list  arg;   /* argument stack passed to the printf function  */
+    _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                               */
 };
 
 /* -------------------------------------------------------------------------- */
@@ -345,12 +347,23 @@ extern char _PDCLIB_Xdigits[];
 /* The worker for all printf() type of functions. The pointer spec should point
    to the introducing '%' of a conversion specifier. The status structure is to
    be that of the current printf() function, of which the members n, s, stream
-   and arg will be preserved, i will be updated, and all others will be trashed
+   and arg will be preserved; i will be updated; and all others will be trashed
    by the function.
    Returns a pointer to the first character not parsed as conversion specifier.
 */
 const char * _PDCLIB_print( const char * spec, struct _PDCLIB_status_t * status );
 
+/* The worker for all scanf() type of functions. The pointer spec should point
+   to the introducing '%' of a conversion specifier. The status structure is to
+   be that of the current scanf() function, of which the member stream will be
+   preserved; n, i, and s will be updated; and all others will be trashed by
+   the function.
+   Returns a pointer to the first character not parsed as conversion specifier,
+   or NULL in case of error.
+   FIXME: Should distinguish between matching and input error
+*/
+const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status );
+
 /* Parsing any fopen() style filemode string into a number of flags. */
 unsigned int _PDCLIB_filemode( const char * mode );