From: Simon Tatham <anakin@pobox.com>
Date: Tue, 24 Mar 2015 19:20:03 +0000 (+0000)
Subject: Fix a compile warning on ARM.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=195217a48062c3ee64a47b1d0b5327e5838a105c;p=sgt-puzzles.git

Fix a compile warning on ARM.

Aapo Rantalainen points out that comparing 'char c' against zero gives
rise to gcc's "comparison is always false" warning, which escalates to
an error under -Werror.

This is one of those situations where the warning is doing more harm
than good, but here's a rephrasing which casts to unsigned so that
both negative numbers and positive out-of-range ones can be caught by
the same comparison.
---

diff --git a/flood.c b/flood.c
index 557da95..bbba915 100644
--- a/flood.c
+++ b/flood.c
@@ -609,7 +609,7 @@ static char *validate_desc(const game_params *params, const char *desc)
             c = 10 + (c - 'A');
         else
             return "Bad character in grid description";
-        if (c < 0 || c >= params->colours)
+        if ((unsigned)c >= params->colours)
             return "Colour out of range in grid description";
     }
     if (*desc != ',')