X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=src%2Fcommand_db.c;h=110f91f4eb2ddcf9c1fade659375e35b493526b0;hb=67bcb0339e09a67fe1685cf81e35ccac18eba0c5;hp=34db4dcd8db41087f789377c4e5941950e7e071f;hpb=7290dec4219eaa2325aa00ef6139f715743dba3a;p=plomrogue diff --git a/src/command_db.c b/src/command_db.c index 34db4dc..110f91f 100644 --- a/src/command_db.c +++ b/src/command_db.c @@ -6,9 +6,9 @@ #include /* for uint8_t */ #include /* 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,11 @@ 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); + uint16_t lines; + uint16_t linemax = textfile_sizes(file, &lines); char line[linemax + 1]; struct Command * cmds = try_malloc(lines * sizeof(struct Command), f_name);