From: Simon Tatham <anakin@pobox.com>
Date: Thu, 4 Aug 2005 17:07:51 +0000 (+0000)
Subject: Bug fix from James H: solve_game() was returning error messages in
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=2e214d740cc9ea2c8061713b0d944f1f29374206;p=sgt-puzzles.git

Bug fix from James H: solve_game() was returning error messages in
the return value rather than in *error. In the old days type-
checking would have caught this, but now of course they're the same
type.

[originally from svn r6161]
---

diff --git a/slant.c b/slant.c
index 06c1f51..1310018 100644
--- a/slant.c
+++ b/slant.c
@@ -734,9 +734,10 @@ static char *solve_game(game_state *state, game_state *currstate,
 	if (ret != 1) {
 	    sfree(soln);
 	    if (ret == 0)
-		return "This puzzle is not self-consistent";
+		*error = "This puzzle is not self-consistent";
 	    else
-		return "Unable to find a unique solution for this puzzle";
+		*error = "Unable to find a unique solution for this puzzle";
+            return NULL;
 	}
 	free_soln = TRUE;
     }