Small rearrangements

[pdclib] / internals / _PDCLIB_int.h

diff --git a/internals/_PDCLIB_int.h b/internals/_PDCLIB_int.h
index faac079c3f54dd559eea5b7b28d5b5495f625111..496f0e6e99c1f677600cbf8fcc905539bdcd3684 100644 (file)
--- a/internals/_PDCLIB_int.h
+++ b/internals/_PDCLIB_int.h
@@ -118,8 +118,6 @@ typedef unsigned char      _PDCLIB_uint8_t;
 #define _PDCLIB_INT8_MAX   _PDCLIB_CHAR_MAX
 #define _PDCLIB_INT8_MIN   _PDCLIB_CHAR_MIN
 #define _PDCLIB_UINT8_MAX  _PDCLIB_UCHAR_MAX
-#define _PDCLIB_INT8_LITERAL
-#define _PDCLIB_UINT8_LITERAL
 #else
 #error Unsupported width of char (not 8 bits).
 #endif
@@ -131,16 +129,12 @@ typedef unsigned int       _PDCLIB_uint16_t;
 #define _PDCLIB_INT16_MAX  _PDCLIB_INT_MAX
 #define _PDCLIB_INT16_MIN  _PDCLIB_INT_MIN
 #define _PDCLIB_UINT16_MAX _PDCLIB_UINT_MAX
-#define _PDCLIB_INT16_LITERAL
-#define _PDCLIB_UINT16_LITERAL
 #elif   _PDCLIB_SHRT_BYTES == 2
 typedef signed short       _PDCLIB_int16_t;
 typedef unsigned short     _PDCLIB_uint16_t;
 #define _PDCLIB_INT16_MAX  _PDCLIB_SHRT_MAX
 #define _PDCLIB_INT16_MIN  _PDCLIB_SHRT_MIN
 #define _PDCLIB_UINT16_MAX _PDCLIB_USHRT_MAX
-#define _PDCLIB_INT16_LITERAL  s
-#define _PDCLIB_UINT16_LITERAL us
 #else
 #error Neither 'short' nor 'int' are 16-bit.
 #endif
@@ -254,21 +248,32 @@ typedef unsigned _PDCLIB_intmax _PDCLIB_uintmax_t;
 /* Various <stdio.h> internals                                                */
 /* -------------------------------------------------------------------------- */
 
-/* Flags for representing mode (see fopen()). */
-#define _PDCLIB_FREAD    1
-#define _PDCLIB_FWRITE   2
-#define _PDCLIB_FAPPEND  4
-#define _PDCLIB_FRW      8
-#define _PDCLIB_FBIN    16
+/* Flags for representing mode (see fopen()). Note these must fit the same
+   status field as the _IO?BF flags in <stdio.h> and the internal flags below.
+*/
+#define _PDCLIB_FREAD    8u
+#define _PDCLIB_FWRITE   16u
+#define _PDCLIB_FAPPEND  32u 
+#define _PDCLIB_FRW      64u
+#define _PDCLIB_FBIN    128u
+
+/* Internal flags, made to fit the same status field as the flags above. */
+#define _PDCLIB_LIBBUFFER    512u
+#define _PDCLIB_VIRGINSTR   1024u
+#define _PDCLIB_ERRORFLAG   2048u
+#define _PDCLIB_EOFFLAG     4096u
+#define _PDCLIB_WIDESTREAM  8192u
+#define _PDCLIB_BYTESTREAM 16384u
 
 struct _PDCLIB_file_t
 {
     _PDCLIB_fd_t            handle;   /* OS-specific file descriptor */
     _PDCLIB_fpos_t          position; /* file position indicator */
-    void *                  buffer;   /* file buffer */
+    char *                  buffer;   /* file buffer */
     _PDCLIB_size_t          bufsize;  /* size of buffer */
-    int                     status;   /* misc. status bits */
-  /*mbstate_t               mbstate;    multibyte parse state - TODO: Unmask. */
+    _PDCLIB_size_t          bufidx;   /* index to point of action in buffer */
+    _PDCLIB_size_t          bufend;   /* index to end of pre-read buffer */
+    unsigned int            status;   /* misc. status bits */
     struct _PDCLIB_file_t * next;     /* provisions for linked list handling */
 };
 
@@ -322,8 +327,23 @@ _PDCLIB_intmax_t _PDCLIB_atomax( const char * s );
 const char * _PDCLIB_strtox_prelim( const char * p, char * sign, int * base );
 _PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, unsigned int base, _PDCLIB_uintmax_t error, _PDCLIB_uintmax_t limval, _PDCLIB_uintmax_t limdigit, char * sign );
 
-/* Digits array used by various integer conversion functions in <stdlib.h>    */
+/* Digits arrays used by various integer conversion functions */
 extern char _PDCLIB_digits[];
-
-/* The worker for all printf() type of functions. */
+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
+   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 );
+
+/* Parsing any fopen() style filemode string into a number of flags. */
+unsigned int _PDCLIB_filemode( const char * mode );
+
+/* Writing out unwritten buffers to file. Returns 0 if successful, EOF if error
+   occured. Sets error flag of stream in case of error. 
+ */
+int _PDCLIB_fflush( struct _PDCLIB_file_t * stream );