zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-20 23:51:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

Return error messages as 'const char *', not 'char *'.

Browse Source 
They're never dynamically allocated, and are almost always string
literals, so const is more appropriate.
This commit is contained in:
Simon Tatham
2017-10-01 13:53:24 +01:00
parent de67801b0f
commit b3243d7504
52 changed files with 266 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
magnets.c
View File

@ -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;