From b3243d75043cf1d70beb88d2a36eaebfe85c2c3f Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sun, 1 Oct 2017 13:53:24 +0100 Subject: Return error messages as 'const char *', not 'char *'. They're never dynamically allocated, and are almost always string literals, so const is more appropriate. --- flip.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'flip.c') diff --git a/flip.c b/flip.c index fc96329..9e5716a 100644 --- a/flip.c +++ b/flip.c @@ -178,7 +178,7 @@ static game_params *custom_params(const config_item *cfg) return ret; } -static char *validate_params(const game_params *params, int full) +static const char *validate_params(const game_params *params, int full) { if (params->w <= 0 || params->h <= 0) return "Width and height must both be greater than zero"; @@ -592,7 +592,7 @@ static char *new_game_desc(const game_params *params, random_state *rs, return ret; } -static char *validate_desc(const game_params *params, const char *desc) +static const char *validate_desc(const game_params *params, const char *desc) { int w = params->w, h = params->h, wh = w * h; int mlen = (wh*wh+3)/4, glen = (wh+3)/4; @@ -669,7 +669,7 @@ static void rowxor(unsigned char *row1, unsigned char *row2, int len) } static char *solve_game(const game_state *state, const game_state *currstate, - const char *aux, char **error) + const char *aux, const char **error) { int w = state->w, h = state->h, wh = w * h; unsigned char *equations, *solution, *shortest; -- cgit v1.1