X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=src%2Freadwrite.h;h=2e0ca9f47e858a57241c9b4595dffffadd8fe661;hb=fdb7a8eb2bc58d180d53f4085085a62bc1f2e62b;hp=58bf4f26ea347fd63161a15515f54b31e2d56db0;hpb=76bcc7383e9b111e02e83c2d822633cf1be88aab;p=plomrogue

diff --git a/src/readwrite.h b/src/readwrite.h
index 58bf4f2..2e0ca9f 100644
--- a/src/readwrite.h
+++ b/src/readwrite.h
@@ -18,6 +18,7 @@ extern FILE * try_fopen(char * path, char * mode, char * f);
 extern void try_fclose(FILE * file, char * f);
 extern void try_fwrite(void * ptr, size_t size, size_t nmemb, FILE * stream,
                        char * f);
+extern void try_fputc(uint8_t c, FILE * file, char * f);
 
 /* Wrapper to calling fgets() from function called "f". The return code of
  * fgets() is returned unless it is NULL *and* ferror() indicates that an error
@@ -25,6 +26,12 @@ extern void try_fwrite(void * ptr, size_t size, size_t nmemb, FILE * stream,
  */
 extern char * try_fgets(char * line, int size, FILE * file, char * f);
 
+/* Wrappers to calling fgetc() and (try_fgetc_noeof()) treating all EOFs returns
+ * as errors to call exit_trouble(), or (try_fgetc()) only if ferror() says so.
+ */
+extern int try_fgetc(FILE * file, char * f);
+extern uint8_t try_fgetc_noeof(FILE * file, char * f);
+
 /* Wrapper to successive call of fclose() from function called "f" on "file",
  * then unlink() on file at "p2" if it exists, then rename() on "p1" to "p2".
  * Used for handling atomic saving of files via temp files.
@@ -48,14 +55,9 @@ extern uint16_t get_linemax(FILE * file, char * f);
 extern uint8_t textfile_sizes(FILE * file, uint16_t * linemax_p,
                               uint16_t * n_lines_p);
 
-/* These routines for reading values "x" from / writing values to "file" ensure
- * a defined endianness and consistent error codes: return 0 on success and 1 on
- * fgetc()/fputc() failure.
- */
-extern uint8_t read_uint8(FILE * file, uint8_t * x);
-extern uint8_t read_uint32_bigendian(FILE * file, uint32_t * x);
-extern uint8_t write_uint8(uint8_t x, FILE * file);
-extern uint8_t write_uint32_bigendian(uint32_t x, FILE * file);
+/* Read/write via try_(fgetc|fputc)() uint32 values with defined endianness. */
+extern uint32_t read_uint32_bigendian(FILE * file);
+extern void write_uint32_bigendian(uint32_t x, FILE * file);