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. --- filling.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'filling.c') diff --git a/filling.c b/filling.c index 585b4bd..6f775f4 100644 --- a/filling.c +++ b/filling.c @@ -184,7 +184,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 < 1) return "Width must be at least one"; if (params->h < 1) return "Height must be at least one"; @@ -1266,7 +1266,7 @@ static char *new_game_desc(const game_params *params, random_state *rs, return sresize(description, j, char); } -static char *validate_desc(const game_params *params, const char *desc) +static const char *validate_desc(const game_params *params, const char *desc) { const int sz = params->w * params->h; const char m = '0' + max(max(params->w, params->h), 3); @@ -1338,7 +1338,7 @@ static void free_game(game_state *state) } static char *solve_game(const game_state *state, const game_state *currstate, - const char *aux, char **error) + const char *aux, const char **error) { if (aux == NULL) { const int w = state->shared->params.w; -- cgit v1.1