From: NHOrus Date: Wed, 5 Jul 2017 14:45:12 +0000 (+0300) Subject: Static analysis warnings squished X-Git-Tag: takebird~13 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F212%2Fhead;p=open-adventure.git Static analysis warnings squished --- diff --git a/actions.c b/actions.c index 06da688..2ac545c 100644 --- a/actions.c +++ b/actions.c @@ -303,7 +303,7 @@ static int vcarry(token_t verb, token_t obj) } if (game.fixed[obj] != IS_FREE) { - /* Next guard tests whether plant is tiny or stashed */ + /* Next guard tests whether plant is tiny or stashed */ if (obj == PLANT && game.prop[PLANT] <= PLANT_THIRSTY) { rspeak(DEEP_ROOTS); return GO_CLEAROBJ; @@ -503,9 +503,9 @@ static int discard(token_t verb, token_t obj, bool just_do_it) game.loc == objects[PILLOW].plac) { rspeak(OK_MAN); } else { - state_change(VASE, AT(PILLOW) - ? VASE_WHOLE - : VASE_DROPPED); + state_change(VASE, AT(PILLOW) + ? VASE_WHOLE + : VASE_DROPPED); if (game.prop[VASE] != VASE_WHOLE) game.fixed[VASE] = IS_FIXED; } @@ -742,8 +742,8 @@ int fill(token_t verb, token_t obj) } state_change(BOTTLE, (LIQLOC(game.loc) == OIL) - ? OIL_BOTTLE - : WATER_BOTTLE); + ? OIL_BOTTLE + : WATER_BOTTLE); if (TOTING(BOTTLE)) game.place[LIQUID()] = CARRIED; return GO_CLEAROBJ; diff --git a/misc.c b/misc.c index 5b1068e..a2626b4 100644 --- a/misc.c +++ b/misc.c @@ -118,11 +118,11 @@ void tokenize(char* raw, struct command_t *cmd) * possible an emulation of the original UI. */ if (settings.oldstyle) { - cmd->raw1[TOKLEN+TOKLEN] = cmd->raw1[TOKLEN+TOKLEN] = '\0'; - for (int i = 0; i < strlen(cmd->raw1); i++) - cmd->raw1[i] = toupper(cmd->raw1[i]); - for (int i = 0; i < strlen(cmd->raw2); i++) - cmd->raw2[i] = toupper(cmd->raw2[i]); + cmd->raw1[TOKLEN + TOKLEN] = cmd->raw2[TOKLEN + TOKLEN] = '\0'; + for (size_t i = 0; i < strlen(cmd->raw1); i++) + cmd->raw1[i] = toupper(cmd->raw1[i]); + for (size_t i = 0; i < strlen(cmd->raw2); i++) + cmd->raw2[i] = toupper(cmd->raw2[i]); } } @@ -351,11 +351,10 @@ char* get_input() bool silent_yes() { - char* reply; bool outcome; for (;;) { - reply = get_input(); + char* reply = get_input(); if (reply == NULL) { // LCOV_EXCL_START // Should be unreachable. Reply should never be NULL @@ -398,13 +397,12 @@ bool yes(const char* question, const char* yes_response, const char* no_response /* Print message X, wait for yes/no answer. If yes, print Y and return true; * if no, print Z and return false. */ { - char* reply; bool outcome; for (;;) { speak(question); - reply = get_input(); + char* reply = get_input(); if (reply == NULL) { // LCOV_EXCL_START // Should be unreachable. Reply should never be NULL