shithub: puzzles

Download patch

ref: 9f87d6fda5f1880881ea14ab54802fcd5581a02c
parent: d7febe24f9e9b98424eacb9a1c7a542f95a360c3
author: Simon Tatham <anakin@pobox.com>
date: Fri Jun 1 14:41:23 EDT 2012 

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.

[originally from svn r9547]


--- a/bridges.c
+++ b/bridges.c
@@ -1464,7 +1464,7 @@
     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 @@
     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 @@
             /* 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 @@
             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 @@
         }
         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++)