Fix some unused-variable warnings.

A test-build with a modern clang points out a number of 'set but not
used' variables, which clang seems to have got better at recently.

In cases where there's conditioned-out or commented-out code using the
variable, I've left it in and added a warning-suppressing cast to
void. Otherwise I've just deleted the variables.
This commit is contained in:
Simon Tatham
2023-06-16 19:03:56 +01:00
parent de13ca2874
commit c82537b457
7 changed files with 11 additions and 15 deletions

View File

@ -409,7 +409,7 @@ static void count_clues_around(const game_params *params,
static void mark_around(const game_params *params,
struct solution_cell *sol, int x, int y, int mark)
{
int i, j, marked = 0;
int i, j;
struct solution_cell *curr;
for (i = -1; i < 2; i++) {
@ -418,7 +418,6 @@ static void mark_around(const game_params *params,
if (curr) {
if (curr->cell == STATE_UNMARKED) {
curr->cell = mark;
marked++;
}
}
}
@ -585,7 +584,7 @@ static bool solve_game_actual(const game_params *params,
int board_size = params->height * params->width;
struct solution_cell *sol = snewn(board_size, struct solution_cell);
bool made_progress = true, error = false;
int solved = 0, iter = 0, curr = 0;
int solved = 0, curr = 0;
memset(sol, 0, params->height * params->width * sizeof(*sol));
solved = 0;
@ -607,7 +606,6 @@ static bool solve_game_actual(const game_params *params,
solved += curr;
}
}
iter++;
}
if (sol_return) {
*sol_return = sol;