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

14
signpost.c
View File

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