Magic-number elimination.

[open-adventure.git] / misc.c

diff --git a/misc.c b/misc.c
index cd1b5bf1f94d487c7996b7fb0d90b29b7c2ee050..c16e9afd9dac2edf08610635ba09ca2dbeb9fb4b 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -217,14 +217,14 @@ void vspeak(const char* msg, va_list ap)
                 }
             }
 
-           /* Version specifier */
+            /* Version specifier */
             if (msg[i] == 'V') {
-               strcpy(renderp, VERSION);
+                strcpy(renderp, VERSION);
                 size_t len = strlen(VERSION);
                 renderp += len;
                 size -= len;
-           }
-           
+            }
+
             // All-lowercase specifier.
             if (msg[i] == 'L' || msg[i] == 'C') {
                 packed_to_token(arg, renderp); /* unpack directly to destination */
@@ -242,11 +242,6 @@ void vspeak(const char* msg, va_list ap)
         }
     }
     *renderp = 0;
-
-    // Deal with messages that are in YAML block format and therefore
-    // have their own trailing \n
-    if (renderp > rendered && renderp[-1] == '\n')
-       *--renderp = '\0';
     
     // Print the message.
     printf("%s\n", rendered);
@@ -350,8 +345,10 @@ char* get_input()
                 printf("%s", input_prompt);
             // LCOV_EXCL_STOP
             ssize_t numread = getline(&input, &n, stdin);
-            if (numread == -1) // Got EOF; return with it.
+            if (numread == -1) { // Got EOF; return with it.
+                free(input);
                 return (NULL);
+            }
         }
 
         if (input == NULL) // Got EOF; return with it.
@@ -529,6 +526,7 @@ long get_vocab_id(const char* word)
 {
     long ref_num;
 
+    /* FIXME: Magic numbers related to vocabulary */
     ref_num = get_motion_vocab_id(word);
     if (ref_num != WORD_NOT_FOUND)
         return (ref_num + 0); // FIXME: replace with a proper hash