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

[plomrogue] / src / command_db.c

diff --git a/src/command_db.c b/src/command_db.c
index 34db4dcd8db41087f789377c4e5941950e7e071f..fd7f4dc7a2f78ae431ebd0bf37ee52bfda574da1 100644 (file)
--- a/src/command_db.c
+++ b/src/command_db.c
@@ -6,9 +6,9 @@
 #include <stdint.h> /* for uint8_t */
 #include <string.h> /* for strlen(), strtok() */
 #include "main.h" /* for world global */
-#include "rexit.h" /* for exit_err() */
 #include "readwrite.h" /* for textfile_sizes(), try_fopen(), try_fclose() */
 #include "misc.h" /* for try_malloc() */
+#include "rexit.h" /* exit_trouble() */
 
 
 
@@ -79,12 +79,12 @@ extern char * get_command_longdsc(char * dsc_short)
 extern void init_command_db()
 {
     char * f_name = "init_command_db()";
-    char * err_s = "Trouble in init_cmds() with textfile_sizes().";
 
     char * path = "config/commands";
     FILE * file = try_fopen(path, "r", f_name);
     uint16_t lines, linemax;
-    exit_err(textfile_sizes(file, &linemax, &lines), err_s);
+    uint8_t test = textfile_sizes(file, &linemax, &lines);
+    exit_trouble(test, f_name, "textfile_sizes()");
     char line[linemax + 1];
 
     struct Command * cmds = try_malloc(lines * sizeof(struct Command), f_name);