X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=src%2Fserver%2Fio.c;h=2507d3b1e3e3a0faee7842261e1f572e8927fedc;hb=cdb90723dd636591bcfa98ebb165cf74a0cdeec7;hp=10fcd90f3dca2da736f13b1fd2a9e21da93d9efc;hpb=dd9d65ee727ac7e95801da0f8b5bae7009811802;p=plomrogue
diff --git a/src/server/io.c b/src/server/io.c
index 10fcd90..2507d3b 100644
--- a/src/server/io.c
+++ b/src/server/io.c
@@ -4,8 +4,8 @@
#include /* global errno */
#include /* open(), O_RDONLY, O_NONBLOCK */
#include /* PIPE_BUF */
-#include /* size_t */
-#include /* uint8_t, uint16_t, uint32_t */
+#include /* size_t, NULL */
+#include /* uint8_t, uint32_t */
#include /* define FILE, sprintf() */
#include /* free() */
#include /* strlen(), memset(), memcpy() */
@@ -66,8 +66,8 @@ static char * get_message_from_queue()
world.queue_size = world.queue_size - cutout_len;
if (0 == world.queue_size)
{
- free(world.queue);
- world.queue = NULL;
+ free(world.queue); /* NULL so read_fifo_into_queue() may free() this */
+ world.queue = NULL; /* every time, even when it's un-allocated first. */
}
else
{
@@ -203,7 +203,7 @@ static void write_map(FILE * file)
}
}
}
- uint16_t x, y;
+ uint8_t x, y;
for (y = 0; y < world.map.size.y; y++)
{
for (x = 0; x < world.map.size.x; x++)