X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=internals%2F_PDCLIB_int.h;h=2420c790e7dc3071ae088bb9ff84c1386f2fedc8;hb=4eb714fe8a267dc25f28f308128b360d204fd27b;hp=a950cf2257b19f7e9425f27010f9de361e86a237;hpb=35deadeb6e2db75a54461d5a3e862096aa0b25dd;p=pdclib.old

diff --git a/internals/_PDCLIB_int.h b/internals/_PDCLIB_int.h
index a950cf2..2420c79 100644
--- a/internals/_PDCLIB_int.h
+++ b/internals/_PDCLIB_int.h
@@ -101,7 +101,7 @@
 #elif _PDCLIB_LLONG_BYTES  == 16
 #define _PDCLIB_LLONG_MAX  0x7fffffffffffffffffffffffffffffffLL
 #define _PDCLIB_LLONG_MIN  (-0x7fffffffffffffffffffffffffffffffLL - 1LL)
-#define _PDCLIB_ULLONG_MAX 0xffffffffffffffffffffffffffffffffLL
+#define _PDCLIB_ULLONG_MAX 0xffffffffffffffffffffffffffffffffULL
 #else
 #error Unsupported width of 'long long' (neither 64 nor 128 bit).
 #endif
@@ -258,11 +258,12 @@ typedef unsigned _PDCLIB_intmax _PDCLIB_uintmax_t;
 #define _PDCLIB_FBIN    128u
 
 /* Internal flags, made to fit the same status field as the flags above. */
-#define _PDCLIB_LIBBUFFER    512u
+#define _PDCLIB_FREEBUFFER   512u
 #define _PDCLIB_ERRORFLAG   1024u
 #define _PDCLIB_EOFFLAG     2048u
 #define _PDCLIB_WIDESTREAM  4096u
 #define _PDCLIB_BYTESTREAM  8192u
+#define _PDCLIB_DELONCLOSE 16384u
 
 /* Position / status structure for getpos() / fsetpos(). */
 struct _PDCLIB_fpos_t
@@ -315,18 +316,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;     /* print: maximum characters to be written       */
-                            /* scan:  number matched conversion specifiers   */
-    _PDCLIB_size_t   i;     /* number of characters read/written             */
-    _PDCLIB_size_t   this;  /* 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                     */
+    _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                                */
+    _PDCLIB_va_list  arg;    /* argument stack                               */
 };
 
 /* -------------------------------------------------------------------------- */
@@ -381,6 +382,9 @@ int _PDCLIB_prepread( struct _PDCLIB_file_t * stream );
 */
 int _PDCLIB_prepwrite( struct _PDCLIB_file_t * stream );
 
+/* Closing all streams on program exit */
+void _PDCLIB_closeall( void );
+
 /* -------------------------------------------------------------------------- */
 /* errno                                                                      */
 /* -------------------------------------------------------------------------- */
@@ -399,4 +403,8 @@ int * _PDCLIB_errno_func( void );
 #define _PDCLIB_EINVAL 5
 /* Used in the example implementation for "I/O retries exceeded". */
 #define _PDCLIB_ERETRY 6
+/* One larger than the largest used errno */
+#define _PDCLIB_EMAX 7
 
+/* TODO: Doing this via a static array is not the way to do it. */
+char const * _PDCLIB_errno_texts[ _PDCLIB_EMAX ];