From eeb2db283de9115f7256fa4cc49597d63e06b0ab Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Sun, 1 Oct 2017 12:52:12 +0100 Subject: New name UI_UPDATE for interpret_move's return "". Now midend.c directly tests the returned pointer for equality to this value, instead of checking whether it's the empty string. A minor effect of this is that games may now return a dynamically allocated empty string from interpret_move() and treat it as just another legal move description. But I don't expect anyone to be perverse enough to actually do that! The main purpose is that it avoids returning a string literal from a function whose return type is a pointer to _non-const_ char, i.e. we are now one step closer to being able to make this code base clean under -Wwrite-strings. --- unequal.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'unequal.c') diff --git a/unequal.c b/unequal.c index a63b7d8..6342318 100644 --- a/unequal.c +++ b/unequal.c @@ -1425,7 +1425,7 @@ static char *interpret_move(const game_state *state, game_ui *ui, ui->hshow = 1; } ui->hcursor = 0; - return ""; + return UI_UPDATE; } if (button == RIGHT_BUTTON) { /* pencil highlighting for non-filled squares */ @@ -1439,7 +1439,7 @@ static char *interpret_move(const game_state *state, game_ui *ui, ui->hshow = 1; } ui->hcursor = 0; - return ""; + return UI_UPDATE; } } @@ -1453,11 +1453,12 @@ static char *interpret_move(const game_state *state, game_ui *ui, ny != ui->hy + adjthan[i].dy); ++i); if (i == 4) - return ""; /* invalid direction, i.e. out of the board */ + return UI_UPDATE; /* invalid direction, i.e. out of + * the board */ if (!(GRID(state, flags, ui->hx, ui->hy) & adjthan[i].f || GRID(state, flags, nx, ny ) & adjthan[i].fo)) - return ""; /* no clue to toggle */ + return UI_UPDATE; /* no clue to toggle */ if (state->adjacent) self = (adjthan[i].dx >= 0 && adjthan[i].dy >= 0); @@ -1475,13 +1476,13 @@ static char *interpret_move(const game_state *state, game_ui *ui, } else { move_cursor(button, &ui->hx, &ui->hy, ds->order, ds->order, FALSE); ui->hshow = ui->hcursor = 1; - return ""; + return UI_UPDATE; } } if (ui->hshow && IS_CURSOR_SELECT(button)) { ui->hpencil = 1 - ui->hpencil; ui->hcursor = 1; - return ""; + return UI_UPDATE; } n = c2n(button, state->order); -- cgit v1.1