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

11
unequal.c
View File

@ -248,7 +248,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->order < 3 || params->order > 32)
return "Order must be between 3 and 32";
@ -1291,7 +1291,7 @@ static game_state *new_game(midend *me, const game_params *params,
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)
{
char *why = NULL;
game_state *dummy = load_game(params, desc, &why);
@ -1304,7 +1304,7 @@ static char *validate_desc(const game_params *params, const char *desc)
}
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;
int r;
@ -2123,7 +2123,7 @@ static int solve(game_params *p, char *desc, int debug)
static void check(game_params *p)
{
char *msg = validate_params(p, 1);
const char *msg = validate_params(p, 1);
if (msg) {
fprintf(stderr, "%s: %s", quis, msg);
exit(1);
@ -2231,7 +2231,8 @@ int main(int argc, const char *argv[])
int i;
for (i = 0; i < argc; i++) {
const char *id = *argv++;
char *desc = strchr(id, ':'), *err;
char *desc = strchr(id, ':');
const char *err;
p = default_params();
if (desc) {
*desc++ = '\0';