aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorD G Turner2019-12-18 06:22:52 +0000
committerD G Turner2019-12-18 06:22:52 +0000
commitd67885f4f3d1be173f6b8e8688da5f18f34b9350 (patch)
tree9cac51f98b86d273ebf2cb1c2eb01dbfdd9605e2
parent26d09314997fa236e10b9edbca4a135eb6c9370a (diff)
downloadscummvm-rg350-d67885f4f3d1be173f6b8e8688da5f18f34b9350.tar.gz
scummvm-rg350-d67885f4f3d1be173f6b8e8688da5f18f34b9350.tar.bz2
scummvm-rg350-d67885f4f3d1be173f6b8e8688da5f18f34b9350.zip
GLK: ALAN3: Fix Missing Default Switch Cases
These are flagged by GCC if -Wswitch-default is enabled.
-rw-r--r--engines/glk/alan3/alt_info.cpp3
-rw-r--r--engines/glk/alan3/fnmatch.cpp2
-rw-r--r--engines/glk/alan3/glkio.cpp2
-rw-r--r--engines/glk/alan3/instance.cpp7
-rw-r--r--engines/glk/alan3/inter.cpp18
-rw-r--r--engines/glk/alan3/sysdep.cpp3
6 files changed, 35 insertions, 0 deletions
diff --git a/engines/glk/alan3/alt_info.cpp b/engines/glk/alan3/alt_info.cpp
index 1e5a05c8a1..21cbb16387 100644
--- a/engines/glk/alan3/alt_info.cpp
+++ b/engines/glk/alan3/alt_info.cpp
@@ -82,6 +82,8 @@ static void traceAltInfo(CONTEXT, AltInfo *alt) {
CALL2(traceInstanceAndItsClass, globalParameters[alt->parameter - 1].instance, alt->_class)
break;
}
+ default:
+ break;
}
}
@@ -128,6 +130,7 @@ static void traceVerbExecution(CONTEXT, AltInfo *alt) {
printf(" (AFTER)");
break;
case Q_DEFAULT:
+ default:
break;
}
printf(":>\n");
diff --git a/engines/glk/alan3/fnmatch.cpp b/engines/glk/alan3/fnmatch.cpp
index 970567261e..c30c521f02 100644
--- a/engines/glk/alan3/fnmatch.cpp
+++ b/engines/glk/alan3/fnmatch.cpp
@@ -144,6 +144,8 @@ int fnmatch(const char *pattern, const char *string, int flags) {
break;
case RANGE_NOMATCH:
return (FNM_NOMATCH);
+ default:
+ break;
}
++string;
break;
diff --git a/engines/glk/alan3/glkio.cpp b/engines/glk/alan3/glkio.cpp
index 3f0da03333..8d791cbb4a 100644
--- a/engines/glk/alan3/glkio.cpp
+++ b/engines/glk/alan3/glkio.cpp
@@ -121,6 +121,8 @@ void GlkIO::setStyle(int style) {
case QUOTE_STYLE:
glk_set_style(style_BlockQuote);
break;
+ default:
+ break;
}
}
diff --git a/engines/glk/alan3/instance.cpp b/engines/glk/alan3/instance.cpp
index e1fab8d78a..fa4084fb94 100644
--- a/engines/glk/alan3/instance.cpp
+++ b/engines/glk/alan3/instance.cpp
@@ -304,6 +304,9 @@ bool isAt(int instance, int other, ATrans trans) {
curr = admin[curr].location;
}
return FALSE;
+
+ default:
+ break;
}
syserr("Unexpected value in switch in isAt() for location");
@@ -328,6 +331,8 @@ bool isAt(int instance, int other, ATrans trans) {
}
return FALSE;
}
+ default:
+ break;
}
syserr("Unexpected value in switch in isAt() for non-location");
return FALSE;
@@ -363,6 +368,8 @@ bool isAt(int instance, int other, ATrans trans) {
}
return ok;
}
+ default:
+ break;
}
syserr("Unexpected value in switch in isAt() for non-location");
return FALSE;
diff --git a/engines/glk/alan3/inter.cpp b/engines/glk/alan3/inter.cpp
index 471f6a907f..a123c8be87 100644
--- a/engines/glk/alan3/inter.cpp
+++ b/engines/glk/alan3/inter.cpp
@@ -120,6 +120,8 @@ static void interpretIf(Aword v) {
return;
}
break;
+ default:
+ break;
}
}
}
@@ -144,6 +146,8 @@ static void interpretElse(void) {
case I_IF:
lev++;
break;
+ default:
+ break;
}
}
}
@@ -168,6 +172,8 @@ static void goToLOOPEND(void) {
case I_LOOP:
level++;
break;
+ default:
+ break;
}
pc++;
}
@@ -195,6 +201,8 @@ static void jumpBackToStartOfMatchingLOOP(void) {
return;
}
break;
+ default:
+ break;
}
}
}
@@ -263,6 +271,8 @@ static void depexec(Aword v) {
return;
}
break;
+ default:
+ break;
}
}
}
@@ -295,6 +305,8 @@ static void depcase(void) {
return;
}
break;
+ default:
+ break;
}
}
}
@@ -368,6 +380,8 @@ static const char *transitivityFlag(ATrans value) {
return "Direct";
case INDIRECT:
return "Indirect";
+ default:
+ break;
}
syserr("Unexpected transitivity");
return "ERROR";
@@ -386,6 +400,8 @@ static const char *printForm(SayForm form) {
return "No";
case SAY_PRONOUN:
return "It";
+ default:
+ break;
}
return "**Unknown!!***";
}
@@ -1234,6 +1250,8 @@ void interpret(CONTEXT, Aaddr adr) {
printf("SUM \t%7ld\t\t\t", (long)attribute);
push(stack, aggregate + attribute);
break;
+ default:
+ break;
}
traceIntegerTopValue();
push(stack, limit);
diff --git a/engines/glk/alan3/sysdep.cpp b/engines/glk/alan3/sysdep.cpp
index ae8625f2f0..8285f41068 100644
--- a/engines/glk/alan3/sysdep.cpp
+++ b/engines/glk/alan3/sysdep.cpp
@@ -278,6 +278,9 @@ void toIso(char copy[], /* OUT - Mapped string */
*c = dosMap[*o];
*c = '\0';
break;
+
+ default:
+ break;
}
}