Add _cbprintf/_vcbprintf (callback based printf formatters)

[pdclib.old] / internals / _PDCLIB_int.h

diff --git a/internals/_PDCLIB_int.h b/internals/_PDCLIB_int.h
index 134123a1862fa650a1bccb0be8bb8186c8f638fd..c200419e6133a0235fd92448066744cdf83db6d6 100644 (file)
--- a/internals/_PDCLIB_int.h
+++ b/internals/_PDCLIB_int.h
@@ -338,13 +338,13 @@ typedef struct _PDCLIB_mbstate {
      */
     _PDCLIB_uint16_t     _Surrogate;
 
      */
     _PDCLIB_uint16_t     _Surrogate;
 

-    /* In cases where the underlying codec is capable of regurgitating a 
+    /* In cases where the underlying codec is capable of regurgitating a

      * character without consuming any extra input (e.g. a surrogate pair in a
      * character without consuming any extra input (e.g. a surrogate pair in a

-     * UCS-4 to UTF-16 conversion) then these fields are used to track that 
+     * UCS-4 to UTF-16 conversion) then these fields are used to track that

      * state. In particular, they are used to buffer/fake the input for mbrtowc
      * and similar functions.
      *
      * state. In particular, they are used to buffer/fake the input for mbrtowc
      * and similar functions.
      *

-     * See _PDCLIB_encoding.h for values of _PendState and the resultant value 
+     * See _PDCLIB_encoding.h for values of _PendState and the resultant value

      * in _PendChar.
      */
     unsigned char _PendState;
      * in _PendChar.
      */
     unsigned char _PendState;


@@ -375,17 +375,26 @@ typedef struct _PDCLIB_file     _PDCLIB_file_t; // Rename to _PDCLIB_FILE?
 /* Status structure required by _PDCLIB_print(). */
 struct _PDCLIB_status_t
 {
 /* Status structure required by _PDCLIB_print(). */
 struct _PDCLIB_status_t
 {

+    /* XXX This structure is horrible now. scanf needs its own */
+

     int              base;   /* base to which the value shall be converted   */
     _PDCLIB_int_fast32_t flags; /* flags and length modifiers                */
     int              base;   /* base to which the value shall be converted   */
     _PDCLIB_int_fast32_t flags; /* flags and length modifiers                */

-    unsigned         n;      /* print: maximum characters to be written      */
+    unsigned         n;      /* print: maximum characters to be written (snprintf) */

                              /* scan:  number matched conversion specifiers  */
     unsigned         i;      /* number of characters read/written            */
     unsigned         current;/* chars read/written in the CURRENT conversion */
                              /* scan:  number matched conversion specifiers  */
     unsigned         i;      /* number of characters read/written            */
     unsigned         current;/* chars read/written in the CURRENT conversion */

-    char *           s;      /* *sprintf(): target buffer                    */
-                             /* *sscanf():  source string                    */

     unsigned         width;  /* specified field width                        */
     int              prec;   /* specified field precision                    */
     unsigned         width;  /* specified field width                        */
     int              prec;   /* specified field precision                    */

-    _PDCLIB_file_t * stream; /* *fprintf() / *fscanf() stream         */
+
+    union {
+        void *           ctx;    /* context for callback */
+        const char *     s;      /* input string for scanf */
+    };
+
+    union {
+        _PDCLIB_size_t ( *write ) ( void *p, const char *buf, _PDCLIB_size_t size );
+        _PDCLIB_file_t *stream;  /* for scanf */
+    };

     _PDCLIB_va_list  arg;    /* argument stack                               */
 };
 
     _PDCLIB_va_list  arg;    /* argument stack                               */
 };