Fix warnings generated by gcc 4.6.0 about variables set but not

thereafter read. Most of these changes are just removal of pointless
stuff or trivial reorganisations; one change is actually substantive,
and fixes a bug in Keen's clue selection (the variable 'bad' was
unreferenced not because I shouldn't have set it, but because I
_should_ have referenced it!).

[originally from svn r9164]
This commit is contained in:
Simon Tatham
2011-05-04 18:22:14 +00:00
parent 4bab5e531b
commit 2efc77d2fd
14 changed files with 31 additions and 54 deletions

5
keen.c
View File

@ -995,7 +995,7 @@ done
/* didn't find a nice one, use a nasty one */
for (i = 0; i < a; i++) {
j = order[i];
if (singletons[j] & good) {
if (singletons[j] & bad) {
clues[j] = clue;
singletons[j] = 0;
break;
@ -1188,7 +1188,6 @@ static game_state *new_game(midend *me, game_params *params, char *desc)
{
int w = params->w, a = w*w;
game_state *state = snew(game_state);
char *err;
const char *p = desc;
int i;
@ -1197,7 +1196,7 @@ static game_state *new_game(midend *me, game_params *params, char *desc)
state->clues->refcount = 1;
state->clues->w = w;
state->clues->dsf = snew_dsf(a);
err = parse_block_structure(&p, w, state->clues->dsf);
parse_block_structure(&p, w, state->clues->dsf);
assert(*p == ',');
p++;