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. --- lightup.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lightup.c') diff --git a/lightup.c b/lightup.c index c5ee418..fd363e0 100644 --- a/lightup.c +++ b/lightup.c @@ -342,7 +342,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 < 2 || params->h < 2) return "Width and height must be at least 2"; @@ -1624,7 +1624,7 @@ goodpuzzle: 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 i; for (i = 0; i < params->w*params->h; i++) { @@ -1695,7 +1695,7 @@ static game_state *new_game(midend *me, const game_params *params, } static char *solve_game(const game_state *state, const game_state *currstate, - const char *aux, char **error) + const char *aux, const char **error) { game_state *solved; char *move = NULL, buf[80]; @@ -2326,7 +2326,8 @@ int main(int argc, char **argv) { game_params *p; game_state *s; - char *id = NULL, *desc, *err, *result; + char *id = NULL, *desc, *result; + const char *err; int nsol, diff, really_verbose = 0; unsigned int sflags; -- cgit v1.1