Clean up warning and deprecation issues.

diff --git a/main.c b/main.c
index dfc682e5b032d805e282ae62018ff44562400919..61a82e2f49e13e2140b97e167e70b6aeac31475b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -147,9 +147,11 @@ char *myreadline(const char *prompt)
     if (settings.argc == 0)
        return readline(prompt);
 
+    char *buf = malloc(BUFSIZ);
     for (;;) {
        if (settings.scriptfp == NULL || feof(settings.scriptfp)) {
            if (settings.optind >= settings.argc) {
+               free(buf);
                return NULL;
            }
 
@@ -164,9 +166,10 @@ char *myreadline(const char *prompt)
        }
 
        if (isatty(fileno(settings.scriptfp))) {
+           free(buf);
            return readline(prompt);
        } else {
-           char *ln = fgets(malloc(BUFSIZ), BUFSIZ-1, settings.scriptfp);
+           char *ln = fgets(buf, BUFSIZ-1, settings.scriptfp);
            if (ln != NULL) {
                fputs(PROMPT, stdout);
                fputs(ln, stdout);
@@ -1041,7 +1044,7 @@ static void listobjects(void)
     }
 }
 
-bool preprocess_command(command_t *command) 
+static bool preprocess_command(command_t *command)
 /* Pre-processes a command input to see if we need to tease out a few specific cases:
  * - "enter water" or "enter stream": 
  *   wierd specific case that gets the user wet, and then kicks us back to get another command
@@ -1263,6 +1266,7 @@ static bool do_command()
                     }
                     break;// LCOV_EXCL_LINE
                 default: // LCOV_EXCL_LINE
+               case NO_WORD_TYPE: // LCOV_EXCL_LINE
                     BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
                 }
 

diff --git a/tests/coverage_dungeon.py b/tests/coverage_dungeon.py
index 439edad30ac1c2f7234c4b1e9bd6c4b2f89ab4a0..46f0b11de4d6803a3752daba22e3d83f7731165c 100755 (executable)
--- a/tests/coverage_dungeon.py
+++ b/tests/coverage_dungeon.py
@@ -197,7 +197,7 @@ if __name__ == "__main__":
     # load DB
     try:
         with open(YAML_PATH, "r") as f:
-            db = yaml.load(f)
+            db = yaml.safe_load(f)
     except IOError as e:
         print('ERROR: could not load {} ({}})'.format(YAML_PATH, e.strerror))
         exit(-1)