shithub: puzzles

Info  •  Files  •  Log  •  Branches

Cleanups and memory leak fixes from James H.

[originally from svn r6099]

--- a/dominosa.c

+++ b/dominosa.c

@@ -1093,6 +1093,7 @@

 static void free_game(game_state *state)

 {

     sfree(state->grid);

+    sfree(state->edges);

     if (--state->numbers->refcount <= 0) {

         sfree(state->numbers->numbers);

         sfree(state->numbers);

@@ -1154,7 +1155,7 @@

 		    int p2 = (i & 1) ? p1+1 : p1+w;

 		    extra = sprintf(buf, ";%c%d,%d",

-				    v==-1 ? 'E' : 'D', p1, p2);

+				    (int)(v==-1 ? 'E' : 'D'), p1, p2);

 		    if (retlen + extra + 1 >= retsize) {

 			retsize = retlen + extra + 256;

@@ -1257,7 +1258,7 @@

             (state->grid[d1] != d1 || state->grid[d2] != d2))

             return NULL;

-        sprintf(buf, "%c%d,%d", button == RIGHT_BUTTON ? 'E' : 'D', d1, d2);

+        sprintf(buf, "%c%d,%d", (int)(button == RIGHT_BUTTON ? 'E' : 'D'), d1, d2);

         return dupstr(buf);

     }

--- a/misc.c

+++ b/misc.c

@@ -210,6 +210,7 @@

             memcpy(carray + eltsize * j, tmp, eltsize);

         }

     }

+    sfree(tmp);

 }

 /* vim: set shiftwidth=4 tabstop=8: */

-- 

⑨