X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bdeck_id%7D%7D/cards/%7B%7Bcard_id%7D%7D/form?a=blobdiff_plain;f=src%2Freadwrite.c;h=bfbd4f65987428fe2051d1b99b57cbe518ab8d1c;hb=76bcc7383e9b111e02e83c2d822633cf1be88aab;hp=09faaeb282dcb8a84731c5c1bce3c69b2dd41c77;hpb=140cadf8f8dc73a1756169dbfa7cb5f05e3b8b8c;p=plomrogue

diff --git a/src/readwrite.c b/src/readwrite.c
index 09faaeb..bfbd4f6 100644
--- a/src/readwrite.c
+++ b/src/readwrite.c
@@ -2,38 +2,27 @@
 
 #include "readwrite.h"
 #include <stdio.h>  /* for FILE typedef, fopen(), fgetc(), fputc(), fseek(),
-                     * sprintf(), fwrite()
+                     * sprintf(), fwrite(), ferror()
                      */
 #include <stdint.h> /* for uint8_t, uint16_t, uint32_t */
 #include <string.h> /* for strlen()*/
 #include <unistd.h> /* for unlink() */
-#include "rexit.h"  /* for exit_err() */
-#include "misc.h"   /* for trouble_msg() */
-struct World;
+#include "rexit.h"  /* for exit_err(), exit_trouble() */
+#include "main.h"   /* for world global */
 
 
 
 /* Read/write "x" from/to "file" as bigendian representation of "size" bits. On
  * failure, return 1, else 0. (As of of now, all extern read/write functions
- * build on top of these.)
- *
- * Only use multiples of 8 greater or equal 32 for "size", so that storage
- * inside uint32_t is possible. Originally a bit number check prefaced the code
- * of both functions. It was removed as redundant due to all possible "size"
- * values being hardcoded into the library (i.e. in all extern functions calling
- * / wrapping around either function). If this ever changes, (re-)insert:
- *
- *    if (0 == size || size > 32 || 0 != size % 8)
- *    {
- *        return 1;
- *    }
+ * build on top of these.) Only use multiples of 8 greater or equal 32 for
+ * "size", so that storage inside uint32_t is possible.
  */
 static uint8_t read_uintX_bigendian(FILE * file, uint32_t * x, uint8_t size);
 static uint8_t write_uintX_bigendian(FILE * file, uint32_t x, uint8_t size);
 
 
 
-extern FILE * try_fopen(char * path, char * mode, struct World * w, char * f)
+extern FILE * try_fopen(char * path, char * mode, char * f)
 {
     char * msg1 = "Trouble in ";
     char * msg2 = " with fopen() (mode '";
@@ -44,45 +33,40 @@ extern FILE * try_fopen(char * path, char * mode, struct World * w, char * f)
     char msg[size];
     sprintf(msg, "%s%s%s%s%s%s%s", msg1, f, msg2, mode, msg3, path, msg4);
     FILE * file_p = fopen(path, mode);
-    exit_err(NULL == file_p, w, msg);
+    exit_err(NULL == file_p, msg);
     return file_p;
 }
 
 
 
-extern void try_fclose(FILE * file, struct World * w, char * f)
+extern void try_fclose(FILE * file, char * f)
 {
-    char * msg = trouble_msg(w, f, "fclose()");
-    exit_err(fclose(file), w, msg);
-    free(msg);
+    exit_trouble(fclose(file), f, "fclose()");
 }
 
 
 
-extern void try_fgets(char * line, int linemax, FILE * file,
-                      struct World * w, char * f)
+extern char * try_fgets(char * line, int linemax, FILE * file, char * f)
 {
-    char * msg = trouble_msg(w, f, "fgets()");
-    exit_err(NULL == fgets(line, linemax, file), w, msg);
-    free(msg);
+    char * test = fgets(line, linemax, file);
+    exit_trouble(NULL == test && ferror(file), f, "fgets()");
+    return test;
 }
 
 
 
 extern void try_fwrite(void * ptr, size_t size, size_t nmemb, FILE * stream,
-                       struct World * w, char * f)
+                       char * f)
 {
-    char * msg = trouble_msg(w, f, "fwrite()");
-    exit_err(0 == fwrite(ptr, size, nmemb, stream), w, msg);
-    free(msg);
+    exit_trouble(0 == fwrite(ptr, size, nmemb, stream), f, "fwrite()");
 }
 
 
 
 extern void try_fclose_unlink_rename(FILE * file, char * p1, char * p2,
-                                     struct World * w, char * f)
+                                     char * f)
 {
-    try_fclose(file, w, f);
+    try_fclose(file, f);
     char * msg1 = "Trouble in ";
     char * msg4 = "'.";
     if (!access(p2, F_OK))
@@ -92,7 +76,7 @@ extern void try_fclose_unlink_rename(FILE * file, char * p1, char * p2,
                         + strlen(f) + strlen(p2) + 1;
         char msg[size];
         sprintf(msg, "%s%s%s%s%s", msg1, f, msg2, p2, msg4);
-        exit_err(unlink(p2), w, msg);
+        exit_err(unlink(p2), msg);
     }
     char * msg2 = " with rename() from '";
     char * msg3 = "' to '";
@@ -100,17 +84,15 @@ extern void try_fclose_unlink_rename(FILE * file, char * p1, char * p2,
                     + strlen(msg3) + strlen(p2) + strlen(msg4) + 1;
     char msg[size];
     sprintf(msg, "%s%s%s%s%s%s%s", msg1, f, msg2, p1, msg3, p2, msg4);
-    exit_err(rename(p1, p2), w, msg);
+    exit_err(rename(p1, p2), msg);
 }
 
 
 
-extern uint16_t get_linemax(FILE * file, struct World * w, char * f)
+extern uint16_t get_linemax(FILE * file, char * f)
 {
-    char * msg = trouble_msg(w, f, "textfile_sizes()");
     uint16_t linemax;
-    exit_err(textfile_sizes(file, &linemax, NULL), w, msg);
-    free(msg);
+    exit_trouble(textfile_sizes(file, &linemax, NULL), f, "textfile_sizes()");
     return linemax;
 }
 
@@ -210,17 +192,6 @@ extern uint8_t read_uint8(FILE * file, uint8_t * x)
 
 
 
-extern uint8_t read_uint16_bigendian(FILE * file, uint16_t * x)
-{
-    /* See read_uint8() introductory code comment for rationale. */
-    uint32_t y = * x;
-    uint8_t err = read_uintX_bigendian(file, &y, 16);
-    * x = (uint16_t) y;
-    return err;
-}
-
-
-
 extern uint8_t read_uint32_bigendian(FILE * file, uint32_t * x)
 {
     return read_uintX_bigendian(file, x, 32);
@@ -235,13 +206,6 @@ extern uint8_t write_uint8(uint8_t x, FILE * file)
 
 
 
-extern uint8_t write_uint16_bigendian(uint16_t x, FILE * file)
-{
-    return write_uintX_bigendian(file, x, 16);
-}
-
-
-
 extern uint8_t write_uint32_bigendian(uint32_t x, FILE * file)
 {
     return write_uintX_bigendian(file, x, 32);