Moved textfile_sizes() to readwrite library.

[plomrogue] / src / command_db.c

diff --git a/src/command_db.c b/src/command_db.c
index ba33e912dc9df39d8b11fe26626e949f2194354c..61ae4b11ba718777de7af6292249b687cd8c6cd3 100644 (file)
--- a/src/command_db.c
+++ b/src/command_db.c
@@ -7,7 +7,7 @@
 #include <string.h> /* for strlen(), strtok() */
 #include "main.h" /* for World struct */
 #include "rexit.h" /* for exit_err() */
-#include "misc.h" /* for textfile_sizes() */
+#include "readwrite.h" /* for textfile_sizes() */
 
 
 
@@ -77,30 +77,33 @@ extern char * get_command_longdsc(struct World * world, char * dsc_short)
 
 extern void init_command_db(struct World * world)
 {
-    char * err = "Trouble in init_cmds() with fopen() on file 'commands'.";
-    FILE * file = fopen("config/commands", "r");
-    exit_err(NULL == file, world, err);
+    char * err_o = "Trouble in init_cmds() with fopen() on file 'commands'.";
+    char * err_s = "Trouble in init_cmds() with textfile_sizes().";
+    char * err_m = "Trouble in init_cmds() with malloc().";
+    char * err_c = "Trouble in init_cmds() with fclose() on file 'commands'.";
+
+    char * path = "config/commands";
+    FILE * file = fopen(path, "r");
+    exit_err(NULL == file, world, err_o);
     uint16_t lines, linemax;
-    textfile_sizes(file, &linemax, &lines);
-    err = "Trouble in init_cmds() with malloc().";
-    char * line = malloc(linemax);
-    exit_err(NULL == line, world, err);
+    exit_err(textfile_sizes(file, &linemax, &lines), world, err_s);
+    char line[linemax + 1];
+
     struct Command * cmds = malloc(lines * sizeof(struct Command));
-    exit_err(NULL == line, world, err);
+    exit_err(NULL == line, world, err_m);
     uint8_t i = 0;
-    while (fgets(line, linemax, file))
+    while (fgets(line, linemax + 1, file))
     {
         cmds[i].id = atoi(strtok(line, " "));
-        copy_tokenized_string(world, &cmds[i].dsc_short, " ", err);
-        copy_tokenized_string(world, &cmds[i].dsc_long, "\n", err);
+        copy_tokenized_string(world, &cmds[i].dsc_short, " ", err_m);
+        copy_tokenized_string(world, &cmds[i].dsc_long, "\n", err_m);
         i++;
     }
-    free(line);
+    exit_err(fclose(file), world, err_c);
+
     world->cmd_db = malloc(sizeof(struct CommandDB));
     world->cmd_db->cmds = cmds;
     world->cmd_db->n = lines;
-    err = "Trouble in init_cmds() with fclose() on file 'commands'.";
-    exit_err(fclose(file), world, err);
 }