Corrected off-by-one error in windows.c:refit_pad() that lead to failure of subpad...

[plomrogue] / src / misc.c

diff --git a/src/misc.c b/src/misc.c
index b007dcd24455f1cd630e7212149887425a20d025..496c58549461370c8e100f28d60737f5edbd9770 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -5,7 +5,7 @@
 #include <unistd.h> /* for unlink(), acess() */
 #include <stdlib.h> /* for calloc(), free() */
 #include <string.h> /* for strlen(), strcmp(), memcpy() */
-#include <stdint.h> /* for uint16_t */
+#include <stdint.h> /* 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,8 +17,8 @@
 
 
 
-extern void textfile_sizes(FILE * file, uint16_t * linemax_p,
-                           uint16_t * n_lines_p)
+extern uint8_t textfile_sizes(FILE * file, uint16_t * linemax_p,
+                              uint16_t * n_lines_p)
 {
     uint16_t n_lines = 0;
     int c = 0;
@@ -41,22 +41,26 @@ extern void textfile_sizes(FILE * file, uint16_t * linemax_p,
             }
         }
     }
-    fseek(file, 0, SEEK_SET);
+    if (-1 == fseek(file, 0, SEEK_SET))
+    {
+        return 1;
+    }
     * linemax_p = linemax;
     if (n_lines_p)
     {
         * n_lines_p = n_lines;
     }
+    return 0;
 }
 
 
 
 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);