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 /unfinished/group.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 'unfinished/group.c')
| -rw-r--r-- | unfinished/group.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/unfinished/group.c b/unfinished/group.c index a9ae704..b812b04 100644 --- a/unfinished/group.c +++ b/unfinished/group.c @@ -240,7 +240,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 < 3 || params->w > 26) return "Grid size must be between 3 and 26"; @@ -777,7 +777,7 @@ done * Gameplay. */ -static char *validate_grid_desc(const char **pdesc, int range, int area) +static const char *validate_grid_desc(const char **pdesc, int range, int area) { const char *desc = *pdesc; int squares = 0; @@ -807,7 +807,7 @@ static char *validate_grid_desc(const char **pdesc, int range, int area) 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 w = params->w, a = w*w; const char *p = desc; @@ -907,7 +907,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->par.w, a = w*w; int i, ret; @@ -2106,7 +2106,8 @@ int main(int argc, char **argv) { game_params *p; game_state *s; - char *id = NULL, *desc, *err; + char *id = NULL, *desc; + const char *err; digit *grid; int grade = FALSE; int ret, diff, really_show_working = FALSE; |