zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-22 08:25:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups from James H: a few missing statics, a precautionary cast

Browse Source 
or two, a debugging fix, a couple of explicit initialisations of
variables that were previously read uninitialised, and a fix for a
whopping great big memory leak in Slant owing to me having
completely forgotten to write free_game().

[originally from svn r6159]
This commit is contained in:
Simon Tatham
2005-08-03 12:44:51 +00:00
parent c212a1b5eb
commit 414330d9ad
5 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
slant.c
View File

@ -198,7 +198,7 @@ struct solver_scratch {
int *dsf;
};
struct solver_scratch *new_scratch(int w, int h)
static struct solver_scratch *new_scratch(int w, int h)
{
int W = w+1, H = h+1;
struct solver_scratch *ret = snew(struct solver_scratch);
@ -206,7 +206,7 @@ struct solver_scratch *new_scratch(int w, int h)
return ret;
}
void free_scratch(struct solver_scratch *sc)
static void free_scratch(struct solver_scratch *sc)
{
sfree(sc->dsf);
sfree(sc);
@ -629,6 +629,13 @@ static game_state *dup_game(game_state *state)
static void free_game(game_state *state)
{
sfree(state->soln);
assert(state->clues);
if (--state->clues->refcount <= 0) {
sfree(state->clues->clues);
sfree(state->clues->dsf);
sfree(state->clues);
}
sfree(state);
}
@ -747,7 +754,7 @@ static char *solve_game(game_state *state, game_state *currstate,
for (x = 0; x < w; x++) {
int v = (soln[y*w+x] == bs ? -1 : +1);
if (state->soln[y*w+x] != v) {
int len = sprintf(buf, ";%c%d,%d", v < 0 ? '\\' : '/', x, y);
int len = sprintf(buf, ";%c%d,%d", (int)(v < 0 ? '\\' : '/'), x, y);
if (movelen + len >= movesize) {
movesize = movelen + len + 256;
move = sresize(move, movesize, char);
@ -894,7 +901,7 @@ static char *interpret_move(game_state *state, game_ui *ui, game_drawstate *ds,
v = -1;
}
sprintf(buf, "%c%d,%d", v==-1 ? '\\' : v==+1 ? '/' : 'C', x, y);
sprintf(buf, "%c%d,%d", (int)(v==-1 ? '\\' : v==+1 ? '/' : 'C'), x, y);
return dupstr(buf);
}
@ -996,6 +1003,7 @@ static game_drawstate *game_new_drawstate(game_state *state)
static void game_free_drawstate(game_drawstate *ds)
{
sfree(ds->todraw);
sfree(ds->grid);
sfree(ds);
}