Module Name: src
Committed By: mrg
Date: Sat Oct 5 23:34:15 UTC 2019
Modified Files:
src/games/battlestar: room.c
Log Message:
expand the internal consistency checks in truedirec() to avoid
fallthrough cases. now if direction turns up wrong (it should
not, but this code can't tell that, and convert it to an enum
that would also fix this, is more effort than this is worth.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/games/battlestar/room.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/battlestar/room.c
diff -u src/games/battlestar/room.c:1.13 src/games/battlestar/room.c:1.14
--- src/games/battlestar/room.c:1.13 Mon May 23 22:44:18 2011
+++ src/games/battlestar/room.c Sat Oct 5 23:34:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: room.c,v 1.13 2011/05/23 22:44:18 joerg Exp $ */
+/* $NetBSD: room.c,v 1.14 2019/10/05 23:34:14 mrg Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)room.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: room.c,v 1.13 2011/05/23 22:44:18 joerg Exp $");
+__RCSID("$NetBSD: room.c,v 1.14 2019/10/05 23:34:14 mrg Exp $");
#endif
#endif /* not lint */
@@ -129,6 +129,7 @@ truedirec(int way, int option)
case WEST:
return ("right");
}
+ break;
case SOUTH:
switch (direction) {
@@ -142,6 +143,7 @@ truedirec(int way, int option)
case WEST:
return ("left");
}
+ break;
case EAST:
switch (direction) {
@@ -155,6 +157,7 @@ truedirec(int way, int option)
return (option == '+' ? "behind you" :
"back");
}
+ break;
case WEST:
switch (direction) {
@@ -168,12 +171,12 @@ truedirec(int way, int option)
case WEST:
return ("ahead");
}
-
- default:
- printf("Error: room %d. More than four directions wanted.",
- position);
- return ("!!");
+ break;
}
+
+ printf("Error: room %d. More than four directions wanted.",
+ position);
+ return ("!!");
}
void
