Test Coverage -- lots of new pieces of actions.c

[open-adventure.git] / common.h

diff --git a/common.h b/common.h
index 3df8b0cdff3922dd149b420354734f4e84062829..942a2716e7a796368689980c349a32cb32ffadd6 100644 (file)
--- a/common.h
+++ b/common.h
@@ -9,7 +9,7 @@
 extern const char advent_to_ascii[128];
 extern const char ascii_to_advent[128];
 
-enum bug_e {
+enum bugtype {
    MESSAGE_LINE_GT_70_CHARACTERS,                         // 0
    NULL_LINE_IN_MESSAGE,                                  // 1
    TOO_MANY_WORDS_OF_MESSAGES,                            // 2
@@ -21,7 +21,6 @@ enum bug_e {
    LOCATION_HAS_CONDITION_BIT_BEING_SET_TWICE,            // 8
    INVALID_SECTION_NUMBER_IN_DATABASE,                    // 9
    TOO_MANY_LOCATIONS,                                    // 10
-   TOO_MANY_CLASS_OR_TURN_MESSAGES,                       // 11
    SPECIAL_TRAVEL_500_GT_L_GT_300_EXCEEDS_GOTO_LIST = 20, // 20
    RAN_OFF_END_OF_VOCABULARY_TABLE,                       // 21
    VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3,       // 22
@@ -30,18 +29,13 @@ enum bug_e {
    CONDITIONAL_TRAVEL_ENTRY_WITH_NO_ALTERATION,           // 25
    LOCATION_HAS_NO_TRAVEL_ENTRIES,                        // 26
    HINT_NUMBER_EXCEEDS_GOTO_LIST,                         // 27
-   INVALID_MOTH_RETURNED_BY_DATA_FUNCTION,                // 28
-   TOO_MANY_PARAMETERS_GIVEN_TO_SETPRM,                   // 29
+   TOO_MANY_PARAMETERS_GIVEN_TO_SETPRM,                   // 28
    SPEECHPART_NOT_TRANSITIVE_OR_INTRANSITIVE_OR_UNKNOWN=99, // 99
    ACTION_RETURNED_PHASE_CODE_BEYOND_END_OF_SWITCH,       // 100
 };
 
-static inline void bug(enum bug_e num, const char *error_string) __attribute__((__noreturn__));
-static inline void bug(enum bug_e num, const char *error_string)
-{
-   fprintf(stderr, "Fatal error %d, %s.\n", num, error_string);
-   exit(EXIT_FAILURE);
-}
+/* Alas, declaring this static confuses the coverage analyzer */
+void bug(enum bugtype, const char *) __attribute__((__noreturn__));
 
 #define BUG(x) bug(x, #x)