From 9706378d9b94cd7800c1c5fe5f3dded71b93f3e7 Mon Sep 17 00:00:00 2001 From: simon Date: Fri, 1 Jun 2012 18:41:23 +0000 Subject: [PATCH] Another uninitialised-variable fix, this one pointing out a real bug. Simplest fix is to just remove the 'n' parameter from solve_island_subgroup, replacing it with a robust island_countbridges. git-svn-id: svn://svn.tartarus.org/sgt/puzzles@9547 cda61777-01e9-0310-a592-d414129be87e --- bridges.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bridges.c b/bridges.c index e0bd609..441173c 100644 --- a/bridges.c +++ b/bridges.c @@ -1464,7 +1464,7 @@ static int solve_island_stage2(struct island *is, int *didsth_r) 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; 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")); /* 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)); 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. * This isn't allowed. */ debug(("island at (%d,%d) makes full subgroup, disallowing.\n", - is->x, is->y, n)); + is->x, is->y)); return 1; } else { 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); map_update_possibles(is->state); - if (solve_island_subgroup(is, i, n) || + if (solve_island_subgroup(is, i) || solve_island_impossible(is->state)) { maxb = n-1; 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); - if (solve_island_subgroup(is, -1, n)) + if (solve_island_subgroup(is, -1)) got = 1; for (j = 0; j < is->adj.npoints; j++) -- 2.11.0