X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=0b28f00a2411e4b1673e9836b604c9c24f22be31;hp=906834291e7cca0b21c894e26913178889f75cf2;hb=b729853e7a6c49a7f4dbb54a92913710f5a51a69;hpb=59243cf8bc1939348467810bc63e107728a680c4

diff --git a/misc.c b/misc.c
index 9068342..0b28f00 100644
--- a/misc.c
+++ b/misc.c
@@ -15,8 +15,11 @@ void* xmalloc(size_t size)
 {
     void* ptr = malloc(size);
     if (ptr == NULL) {
+        // LCOV_EXCL_START
+        // exclude from coverage analysis because we can't simulate an out of memory error in testing
         fprintf(stderr, "Out of memory!\n");
         exit(EXIT_FAILURE);
+        // LCOV_EXCL_STOP 
     }
     return (ptr);
 }
@@ -41,18 +44,6 @@ void packed_to_token(long packed, char token[6])
     }
 }
 
-void token_to_packed(char token[6], long* packed)
-{
-  *packed = 0;
-  for (size_t i = 0; i < 5; ++i)
-    {
-      if (token[4 - i] == '\0')
-	continue;	
-      char mapped = ascii_to_advent[(int) token[4 - i]];
-      *packed |= (mapped << (6 * i));
-    }
-}
-
 /* Hide the fact that wods are corrently packed longs */
 
 bool wordeq(token_t a, token_t b)
@@ -172,16 +163,16 @@ void pspeak(vocab_t msg, enum speaktype mode, int skip, ...)
     va_start(ap, skip);
     switch (mode) {
     case touch:
-        vspeak(object_descriptions[msg].inventory, ap);
+        vspeak(objects[msg].inventory, ap);
 	break;
     case look: 
-        vspeak(object_descriptions[msg].longs[skip], ap);
+        vspeak(objects[msg].longs[skip], ap);
 	break;
     case hear:
-        vspeak(object_descriptions[msg].sounds[skip], ap);
+        vspeak(objects[msg].sounds[skip], ap);
 	break;
     case study:
-        vspeak(object_descriptions[msg].texts[skip], ap);
+        vspeak(objects[msg].texts[skip], ap);
 	break;
     }
     va_end(ap);
@@ -261,7 +252,10 @@ char* get_input()
             input = NULL;
             size_t n = 0;
             if (isatty(0))
+            // LCOV_EXCL_START
+            // Should be unreachable in tests, as they will use a non-interactive shell.
                 printf("%s", input_prompt);
+            // LCOV_EXCL_STOP 
             IGNORE(getline(&input, &n, stdin));
         }
 
@@ -298,10 +292,13 @@ bool yes(const char* question, const char* yes_response, const char* no_response
         speak(question);
 
         reply = get_input();
-	if (reply == NULL) {
-	  linenoiseFree(reply);
-	  exit(EXIT_SUCCESS);
-	}
+        if (reply == NULL) {
+            // LCOV_EXCL_START
+            // Should be unreachable. Reply should never be NULL
+            linenoiseFree(reply);
+            exit(EXIT_SUCCESS);
+            // LCOV_EXCL_STOP 
+        }
 
         char* firstword = (char*) xmalloc(strlen(reply)+1);
         sscanf(reply, "%s", firstword);
@@ -420,7 +417,7 @@ long vocab(long id, long init)
             lexeme = -1;
             if (init < 0)
                 return (lexeme);
-            BUG(REQUIRED_VOCABULARY_WORD_NOT_FOUND);
+            BUG(REQUIRED_VOCABULARY_WORD_NOT_FOUND); // LCOV_EXCL_LINE
         }
         if (init >= 0 && KTAB[i] / 1000 != init)
             continue;
@@ -431,7 +428,7 @@ long vocab(long id, long init)
             return (lexeme);
         }
     }
-    BUG(RAN_OFF_END_OF_VOCABULARY_TABLE);
+    BUG(RAN_OFF_END_OF_VOCABULARY_TABLE); // LCOV_EXCL_LINE
 }
 
 void juggle(long object)
@@ -699,10 +696,12 @@ void datime(long* d, long* t)
     *t = (long) tv.tv_usec;
 }
 
+// LCOV_EXCL_START
 void bug(enum bugtype num, const char *error_string)
 {
     fprintf(stderr, "Fatal error %d, %s.\n", num, error_string);
     exit(EXIT_FAILURE);
 }
+// LCOV_EXCL_STOP
 
 /* end */