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. --- signpost.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'signpost.c') diff --git a/signpost.c b/signpost.c index 61bd3c0..9c1c9ba 100644 --- a/signpost.c +++ b/signpost.c @@ -415,7 +415,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"; @@ -843,7 +843,7 @@ generate: 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) { char *ret = NULL; @@ -1337,7 +1337,7 @@ static int solve_state(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) { game_state *tosolve; char *ret = NULL; @@ -1559,7 +1559,7 @@ static game_state *execute_move(const game_state *state, const char *move) if (move[0] == 'S') { game_params p; game_state *tmp; - char *valid; + const char *valid; int i; p.w = state->w; p.h = state->h; @@ -2328,7 +2328,8 @@ static void start_soak(game_params *p, char *seedstr) static void process_desc(char *id) { - char *desc, *err, *solvestr; + char *desc, *solvestr; + const char *err; game_params *p; game_state *s; @@ -2372,7 +2373,8 @@ static void process_desc(char *id) int main(int argc, const char *argv[]) { - char *id = NULL, *desc, *err, *aux = NULL; + char *id = NULL, *desc, *aux = NULL; + const char *err; int soak = 0, verbose = 0, stdin_desc = 0, n = 1, i; char *seedstr = NULL, newseed[16]; -- cgit v1.1