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. --- tents.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tents.c') diff --git a/tents.c b/tents.c index 4ffeb7b..e17a893 100644 --- a/tents.c +++ b/tents.c @@ -1559,7 +1559,7 @@ static char *interpret_move(const game_state *state, game_ui *ui, ui->dsy = ui->dey = y; ui->drag_ok = TRUE; ui->cdisp = 0; - return ""; /* ui updated */ + return UI_UPDATE; } if ((IS_MOUSE_DRAG(button) || IS_MOUSE_RELEASE(button)) && @@ -1590,14 +1590,14 @@ static char *interpret_move(const game_state *state, game_ui *ui, } if (IS_MOUSE_DRAG(button)) - return ""; /* ui updated */ + return UI_UPDATE; /* * The drag has been released. Enact it. */ if (!ui->drag_ok) { ui->drag_button = -1; - return ""; /* drag was just cancelled */ + return UI_UPDATE; /* drag was just cancelled */ } xmin = min(ui->dsx, ui->dex); @@ -1635,7 +1635,7 @@ static char *interpret_move(const game_state *state, game_ui *ui, if (buflen == 0) { sfree(buf); - return ""; /* ui updated (drag was terminated) */ + return UI_UPDATE; /* drag was terminated */ } else { buf[buflen] = '\0'; return buf; @@ -1663,7 +1663,7 @@ static char *interpret_move(const game_state *state, game_ui *ui, if (len) return dupstr(tmpbuf); } else move_cursor(button, &ui->cx, &ui->cy, w, h, 0); - return ""; + return UI_UPDATE; } if (ui->cdisp) { char rep = 0; @@ -1690,7 +1690,7 @@ static char *interpret_move(const game_state *state, game_ui *ui, } } else if (IS_CURSOR_SELECT(button)) { ui->cdisp = 1; - return ""; + return UI_UPDATE; } return NULL; -- cgit v1.1