Move checking for error results into exit_err(), out of conditionals in the remaining...

diff --git a/src/rexit.c b/src/rexit.c
index f7bb3f23e8553132a8ad2a84c72be0448cb61b31..223c79ba0a2c84630bebe07739e8234a15d6ccbd 100644 (file)
--- a/src/rexit.c
+++ b/src/rexit.c
@@ -59,8 +59,12 @@ extern void exit_game(struct World * world)
 
 
 
-extern void exit_err(struct World * world, char * msg)
+extern void exit_err(unsigned char fail, struct World * world, char * msg)
 {
+    if (0 == fail)
+    {
+        return;
+    }
     cleanup(world);
     printf(msg);
     exit(EXIT_FAILURE);

diff --git a/src/rexit.h b/src/rexit.h
index 8a5444f08b8b06f7336824b4475470c99e045c86..d4b19d7e70a7af7ce15d067bf14268f614119552 100644 (file)
--- a/src/rexit.h
+++ b/src/rexit.h
@@ -29,10 +29,16 @@ extern void set_cleanup_flag(enum cleanup_flag flag);
 
 
 
-/* Exit orderly without message or on error with an error message ("msg").
- */
+/* Exit orderly, clean up. */
 extern void exit_game(struct World * world);
-extern void exit_err(struct World * world, char * msg);
+
+
+
+/* If fail != 0, exit with an error message "msg" and clean up. (For  "fail",
+ * pass the result of functions that return non-zero as an error status and
+ * thereby avoid bloating up the code with if-error-conditionals.)
+ */
+extern void exit_err(unsigned char fail, struct World * world, char * msg);