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

Another uninitialised-variable fix, this one pointing out a real bug.

Browse Source 
Simplest fix is to just remove the 'n' parameter from
solve_island_subgroup, replacing it with a robust island_countbridges.

[originally from svn r9547]
This commit is contained in:
Simon Tatham
2012-06-01 18:41:23 +00:00
parent d7febe24f9
commit 9f87d6fda5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bridges.c
View File

@ -1464,7 +1464,7 @@ static int solve_island_stage2(struct island *is, int *didsth_r)
return 1; return 1;
} }
static int solve_island_subgroup(struct island *is, int direction, int n) static int solve_island_subgroup(struct island *is, int direction)
{ {
struct island *is_join; struct island *is_join;
int nislands, *dsf = is->state->solver->dsf; int nislands, *dsf = is->state->solver->dsf;
@ -1473,7 +1473,7 @@ static int solve_island_subgroup(struct island *is, int direction, int n)
debug(("..checking subgroups.\n")); debug(("..checking subgroups.\n"));
/* if is isn't full, return 0. */ /* if is isn't full, return 0. */
if (n < is->count) { if (island_countbridges(is) < is->count) {
debug(("...orig island (%d,%d) not full.\n", is->x, is->y)); debug(("...orig island (%d,%d) not full.\n", is->x, is->y));
return 0; return 0;
} }
@ -1499,7 +1499,7 @@ static int solve_island_subgroup(struct island *is, int direction, int n)
/* we have a full subgroup that isn't the whole set. /* we have a full subgroup that isn't the whole set.
* This isn't allowed. */ * This isn't allowed. */
debug(("island at (%d,%d) makes full subgroup, disallowing.\n", debug(("island at (%d,%d) makes full subgroup, disallowing.\n",
is->x, is->y, n)); is->x, is->y));
return 1; return 1;
} else { } else {
debug(("...has finished puzzle.\n")); debug(("...has finished puzzle.\n"));
@ -1562,7 +1562,7 @@ static int solve_island_stage3(struct island *is, int *didsth_r)
solve_join(is, i, n, 0); solve_join(is, i, n, 0);
map_update_possibles(is->state); map_update_possibles(is->state);
if (solve_island_subgroup(is, i, n) || if (solve_island_subgroup(is, i) ||
solve_island_impossible(is->state)) { solve_island_impossible(is->state)) {
maxb = n-1; maxb = n-1;
debug(("island at (%d,%d) d(%d,%d) new max of %d bridges:\n", debug(("island at (%d,%d) d(%d,%d) new max of %d bridges:\n",
@ -1652,7 +1652,7 @@ static int solve_island_stage3(struct island *is, int *didsth_r)
} }
map_update_possibles(is->state); map_update_possibles(is->state);
if (solve_island_subgroup(is, -1, n)) if (solve_island_subgroup(is, -1))
got = 1; got = 1;
for (j = 0; j < is->adj.npoints; j++) for (j = 0; j < is->adj.npoints; j++)