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.
This commit is contained in:
Simon Tatham
2015-03-24 19:20:03 +00:00
parent 05b533d1f8
commit 195217a480

View File

@ -609,7 +609,7 @@ static char *validate_desc(const game_params *params, const char *desc)
c = 10 + (c - 'A'); c = 10 + (c - 'A');
else else
return "Bad character in grid description"; 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"; return "Colour out of range in grid description";
} }
if (*desc != ',') if (*desc != ',')