From: Christian Heller Date: Sun, 1 Dec 2013 04:04:54 +0000 (+0100) Subject: Replaced fgets() with try_fgets() in command_db library. X-Git-Tag: tce~897 X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/%7B%7B%20web_path%20%7D%7D/decks/static/task?a=commitdiff_plain;h=e75b508724effaad1bfd6dcf337c34a368855095;p=plomrogue Replaced fgets() with try_fgets() in command_db library. --- diff --git a/src/command_db.c b/src/command_db.c index 110f91f..37f4d69 100644 --- a/src/command_db.c +++ b/src/command_db.c @@ -2,13 +2,14 @@ #include "command_db.h" #include /* for free() */ -#include /* for FILE typedef, fgets() */ +#include /* for FILE typedef */ #include /* for uint8_t */ #include /* for strlen(), strtok() */ #include "main.h" /* for world global */ -#include "readwrite.h" /* for textfile_sizes(), try_fopen(), try_fclose() */ +#include "readwrite.h" /* for textfile_sizes(), try_fopen(), try_fclose(), + * try_fgets() + */ #include "misc.h" /* for try_malloc() */ -#include "rexit.h" /* exit_trouble() */ @@ -79,16 +80,14 @@ extern char * get_command_longdsc(char * dsc_short) extern void init_command_db() { char * f_name = "init_command_db()"; - char * path = "config/commands"; FILE * file = try_fopen(path, "r", f_name); 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); uint8_t i = 0; - while (fgets(line, linemax + 1, file)) + while (try_fgets(line, linemax + 1, file, f_name)) { if ('\n' == line[0] || 0 == line[0]) { @@ -100,7 +99,6 @@ extern void init_command_db() i++; } try_fclose(file, f_name); - world.cmd_db = try_malloc(sizeof(struct CommandDB), f_name); world.cmd_db->cmds = cmds; world.cmd_db->n = lines;