Cleanups and memory leak fixes from James H.

[originally from svn r6099]
This commit is contained in:
Simon Tatham
2005-07-16 20:06:37 +00:00
parent e7d6c0aa33
commit 931a7ca45f
2 changed files with 4 additions and 2 deletions

View File

@ -1093,6 +1093,7 @@ static game_state *dup_game(game_state *state)
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 @@ static char *solve_game(game_state *state, game_state *currstate,
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 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
(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);
}

1
misc.c
View File

@ -210,6 +210,7 @@ void shuffle(void *array, int nelts, int eltsize, random_state *rs)
memcpy(carray + eltsize * j, tmp, eltsize);
}
}
sfree(tmp);
}
/* vim: set shiftwidth=4 tabstop=8: */