X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=misc.c;h=45528c20dd2e7485a4c93c85964ea19bbf0e6497;hb=aca6d79087dc9ef6f9f1b4e1d2ef0d25d405db9b;hp=e7a03984b0fb96739797499247b797e49e984166;hpb=2fac8d1aefb3526618ba0f1e7d25c7c7c81dddf4;p=open-adventure.git

diff --git a/misc.c b/misc.c
index e7a0398..45528c2 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)
@@ -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)
@@ -538,7 +535,7 @@ long atdwrf(long where)
 long setbit(long bit)
 /*  Returns 2**bit for use in constructing bit-masks. */
 {
-    return (1 << bit);
+    return (1L << bit);
 }
 
 bool tstbit(long mask, int bit)
@@ -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 */