X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=internals%2F_PDCLIB_int.h;h=1cc8c018c834ad9ade5702a48856b6256082c60a;hb=9b1e6c0a721f9358d9bbc76410e719a878e27edb;hp=99b6652d44eaafe2cd98824f37a14fb60150fd60;hpb=27196188230fa28fad9e256086428348e8550077;p=pdclib diff --git a/internals/_PDCLIB_int.h b/internals/_PDCLIB_int.h index 99b6652..1cc8c01 100644 --- a/internals/_PDCLIB_int.h +++ b/internals/_PDCLIB_int.h @@ -255,11 +255,11 @@ typedef unsigned _PDCLIB_intmax _PDCLIB_uintmax_t; /* -------------------------------------------------------------------------- */ /* 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 +#define _PDCLIB_FREAD 1u +#define _PDCLIB_FWRITE 2u +#define _PDCLIB_FAPPEND 4u +#define _PDCLIB_FRW 8u +#define _PDCLIB_FBIN 16u struct _PDCLIB_file_t { @@ -267,7 +267,7 @@ struct _PDCLIB_file_t _PDCLIB_fpos_t position; /* file position indicator */ void * buffer; /* file buffer */ _PDCLIB_size_t bufsize; /* size of buffer */ - int status; /* misc. status bits */ + unsigned int status; /* misc. status bits */ /*mbstate_t mbstate; multibyte parse state - TODO: Unmask. */ struct _PDCLIB_file_t * next; /* provisions for linked list handling */ }; @@ -311,18 +311,6 @@ struct _PDCLIB_status_t _PDCLIB_va_list arg; /* argument stack passed to the printf function */ }; -#if 0 - -/* fpos_t, an object type (not an array!) capable of storing any position - information of a file. -*/ -typedef unsigned long long int _PDCLIB_fpos_t; - -/* file descriptor - a type used by the OS to identify a stream */ -typedef int _PDCLIB_fd_t; - -#endif - /* -------------------------------------------------------------------------- */ /* Declaration of helper functions (implemented in functions/_PDCLIB). */ /* -------------------------------------------------------------------------- */ @@ -334,8 +322,15 @@ _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 */ +/* 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 );