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. --- magnets.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'magnets.c') diff --git a/magnets.c b/magnets.c index 5a6b661..ebb5376 100644 --- a/magnets.c +++ b/magnets.c @@ -227,7 +227,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) return "Width must be at least one"; if (params->h < 2) return "Height must be at least one"; @@ -534,7 +534,7 @@ done: return state; } -static char *validate_desc(const game_params *params, const char *desc) +static const char *validate_desc(const game_params *params, const char *desc) { const char *prob; game_state *st = new_game_int(params, desc, &prob); @@ -1450,7 +1450,7 @@ static void solve_from_aux(const game_state *state, const char *aux) } 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 = dup_game(currstate); char *move = NULL; @@ -2535,7 +2535,8 @@ static void start_soak(game_params *p, random_state *rs) int main(int argc, const char *argv[]) { int print = 0, soak = 0, solved = 0, ret; - char *id = NULL, *desc, *desc_gen = NULL, *err, *aux = NULL; + char *id = NULL, *desc, *desc_gen = NULL, *aux = NULL; + const char *err; game_state *s = NULL; game_params *p = NULL; random_state *rs = NULL; -- cgit v1.1