diff options
| author | Simon Tatham <anakin@pobox.com> | 2017-10-01 13:53:24 +0100 |
|---|---|---|
| committer | Simon Tatham <anakin@pobox.com> | 2017-10-01 16:34:41 +0100 |
| commit | b3243d75043cf1d70beb88d2a36eaebfe85c2c3f (patch) | |
| tree | ab6151e321465c172582ca064910665f055ceec9 /unruly.c | |
| parent | de67801b0fd3dfa11777c1ef86cd617baf376b7b (diff) | |
| download | puzzles-b3243d75043cf1d70beb88d2a36eaebfe85c2c3f.zip puzzles-b3243d75043cf1d70beb88d2a36eaebfe85c2c3f.tar.gz puzzles-b3243d75043cf1d70beb88d2a36eaebfe85c2c3f.tar.bz2 puzzles-b3243d75043cf1d70beb88d2a36eaebfe85c2c3f.tar.xz | |
Return error messages as 'const char *', not 'char *'.
They're never dynamically allocated, and are almost always string
literals, so const is more appropriate.
Diffstat (limited to 'unruly.c')
| -rw-r--r-- | unruly.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -273,7 +273,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->w2 & 1) || (params->h2 & 1)) return "Width and height must both be even"; @@ -315,7 +315,7 @@ static char *validate_params(const game_params *params, int full) return NULL; } -static char *validate_desc(const game_params *params, const char *desc) +static const char *validate_desc(const game_params *params, const char *desc) { int w2 = params->w2, h2 = params->h2; int s = w2 * h2; @@ -1174,7 +1174,7 @@ static int unruly_solve_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) { game_state *solved = dup_game(state); struct unruly_scratch *scratch = unruly_new_scratch(solved); @@ -1972,7 +1972,8 @@ int main(int argc, char *argv[]) game_params *params = NULL; - char *id = NULL, *desc = NULL, *err; + char *id = NULL, *desc = NULL; + const char *err; quis = argv[0]; |