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. --- tents.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tents.c') diff --git a/tents.c b/tents.c index 1d987fa..0057aed 100644 --- a/tents.c +++ b/tents.c @@ -400,7 +400,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) { /* * Generating anything under 4x4 runs into trouble of one kind @@ -1186,7 +1186,7 @@ static char *new_game_desc(const game_params *params_in, 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; int area, i; @@ -1312,7 +1312,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) { int w = state->p.w, h = state->p.h; @@ -2650,7 +2650,8 @@ int main(int argc, char **argv) { game_params *p; game_state *s, *s2; - char *id = NULL, *desc, *err; + char *id = NULL, *desc; + const char *err; int grade = FALSE; int ret, diff, really_verbose = FALSE; struct solver_scratch *sc; -- cgit v1.1