X-Git-Url: https://plomlompom.com/repos/do_todos?a=blobdiff_plain;f=src%2Fmisc.c;h=4632a0bccadefd2e2b45b2010643f4241f05b164;hb=0e6c855b67e0cd3def7196396f3d1f45ff85b692;hp=b007dcd24455f1cd630e7212149887425a20d025;hpb=e6dcab0e1261bc96d7754b24b798cc3a5f262335;p=plomrogue diff --git a/src/misc.c b/src/misc.c index b007dcd..4632a0b 100644 --- a/src/misc.c +++ b/src/misc.c @@ -5,7 +5,7 @@ #include /* for unlink(), acess() */ #include /* for calloc(), free() */ #include /* for strlen(), strcmp(), memcpy() */ -#include /* for uint16_t */ +#include /* for uint8_t, uint16_t */ #include "readwrite.h" /* for [read/write]_uint[8/16/32][_bigendian]() */ #include "map_objects.h" /* for struct Monster, write_map_objects(), */ #include "map_object_actions.h" /* for is_passable(), move_monster() */ @@ -17,46 +17,12 @@ -extern void textfile_sizes(FILE * file, uint16_t * linemax_p, - uint16_t * n_lines_p) -{ - uint16_t n_lines = 0; - int c = 0; - uint16_t linemax = 0; - uint16_t c_count = 0; - while (EOF != c) - { - c_count++; - c = getc(file); - if ('\n' == c) - { - if (c_count > linemax) - { - linemax = c_count + 1; - } - c_count = 0; - if (n_lines_p) - { - n_lines++; - } - } - } - fseek(file, 0, SEEK_SET); - * linemax_p = linemax; - if (n_lines_p) - { - * n_lines_p = n_lines; - } -} - - - extern void update_log(struct World * world, char * text) { - static char * last_msg; - if (0 == last_msg) - { - last_msg = calloc(1, sizeof(char)); + static char * last_msg; /* TODO: valgrind is dissatisfied */ + if (0 == last_msg) /* with this calloc'd pointer */ + { /* never being freed. */ + last_msg = calloc(1, sizeof(char)); /* Rectify this ? */ } char * new_text; uint16_t len_old = strlen(world->log);