X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=b2ad68802672a33c6311ddf3d7a68431757a456a;hb=17782cab6754a39822d36254c6c8daff4d18af6a;hp=35c4e4b46b1f41dbf60f2aac877d6c6bd88b8dbf;hpb=9af3ab4ecddbd6dd0347a4adc54a98b5153a9fb6;p=open-adventure.git diff --git a/misc.c b/misc.c index 35c4e4b..b2ad688 100644 --- a/misc.c +++ b/misc.c @@ -1,5 +1,5 @@ /* - * I/O and support riutines. + * I/O and support routines. * * Copyright (c) 1977, 2005 by Will Crowther and Don Woods * Copyright (c) 2017 by Eric S. Raymond @@ -221,8 +221,8 @@ static char* get_input(void) // Print a blank line printf("\n"); - char* input; - while (true) { + char* input = ""; + for (;;) { input = myreadline(input_prompt); if (input == NULL) // Got EOF; return with it. @@ -283,12 +283,10 @@ bool silent_yes_or_no(void) free(firstword); - if (yes == 0 || - y == 0) { + if (yes == 0 || y == 0) { outcome = true; break; - } else if (no == 0 || - n == 0) { + } else if (no == 0 || n == 0) { outcome = false; break; } else @@ -413,7 +411,7 @@ static bool is_valid_int(const char *str) if (!*str) return false; // LCOV_EXCL_LINE - // Check for non-digit chars in the rest of the stirng. + // Check for non-digit chars in the rest of the string. while (*str) { if (!isdigit(*str)) return false; @@ -478,7 +476,7 @@ static void get_vocab_metadata(const char* word, vocab_t* id, word_type_t* type) static void tokenize(char* raw, command_t *cmd) { /* - * Be caereful about modifing this. We do not want to nuke the + * Be careful about modifying this. We do not want to nuke the * the speech part or ID from the previous turn. */ memset(&cmd->word[0].raw, '\0', sizeof(cmd->word[0].raw)); @@ -492,7 +490,7 @@ static void tokenize(char* raw, command_t *cmd) /* (ESR) In oldstyle mode, simulate the uppercasing and truncating * effect on raw tokens of packing them into sixbit characters, 5 * to a 32-bit word. This is something the FORTRAN version did - * becuse archaic FORTRAN had no string types. Don Wood's + * because archaic FORTRAN had no string types. Don Wood's * mechanical translation of 2.5 to C retained the packing and * thus this misfeature. * @@ -569,7 +567,6 @@ void clear_command(command_t *cmd) cmd->state = EMPTY; } - void juggle(obj_t object) /* Juggle an object by picking it up and putting it down again, the purpose * being to get the object to the front of the chain of things at its loc. */