Some code-stylistic improvements to rexit library; also moved exit_trouble() into it.

[plomrogue] / src / readwrite.c

diff --git a/src/readwrite.c b/src/readwrite.c
index 657d8173dd674ecfa9528cfce9653ee5dd841449..e5db3061cf10abb5408dfea5afffac3d2d80862e 100644 (file)
--- a/src/readwrite.c
+++ b/src/readwrite.c
@@ -7,9 +7,8 @@
 #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 */
 
 
 
@@ -33,7 +32,7 @@ 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,47 +43,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 char * 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()");
     char * test = fgets(line, linemax, file);
-    exit_err(NULL == test && ferror(file), w, msg);
-    free(msg);
+    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))
@@ -94,7 +86,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 '";
@@ -102,17 +94,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;
 }