X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=internals%2F_PDCLIB_int.h;h=1c89ae08b0ee962b71a7be012f21867551fe4246;hb=13ee02fa27a739d9d602f801126eadcfbfeab8a8;hp=9d83c66918e0b554d3d692c6dded60c8b00bf3c9;hpb=c14942cf48db3027ccd12dd36e5f13fe257afa6b;p=pdclib diff --git a/internals/_PDCLIB_int.h b/internals/_PDCLIB_int.h index 9d83c66..1c89ae0 100644 --- a/internals/_PDCLIB_int.h +++ b/internals/_PDCLIB_int.h @@ -254,19 +254,29 @@ typedef unsigned _PDCLIB_intmax _PDCLIB_uintmax_t; /* Various 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 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_WROTELAST 256u +#define _PDCLIB_LIBBUFFER 512u +#define _PDCLIB_VIRGINSTR 1024u +#define _PDCLIB_ERRORFLAG 2048u +#define _PDCLIB_EOFFLAG 4096u 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 */ + _PDCLIB_size_t bufidx; /* pointer into buffer */ unsigned int status; /* misc. status bits */ /*mbstate_t mbstate; multibyte parse state - TODO: Unmask. */ struct _PDCLIB_file_t * next; /* provisions for linked list handling */ @@ -326,5 +336,11 @@ _PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, unsigned int base, _PDCL extern char _PDCLIB_digits[]; extern char _PDCLIB_Xdigits[]; -/* The worker for all printf() type of functions. */ +/* 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 );