Clean up switch cases: proper fall through comments, no break after

return.

diff --git a/src/lib/commands/mfir.c b/src/lib/commands/mfir.c
index 93bfb13430d50b036b2d0f33ad87549abd104669..8d1c4a92da1480d0293791e9197ba0d782fad51e 100644 (file)
--- a/src/lib/commands/mfir.c
+++ b/src/lib/commands/mfir.c
@@ -601,6 +601,7 @@ multifire(void)
            break;
        case targ_ship:
            nreport(player->cnum, N_SHP_SHELL, vict, 1);
+           /* fall through */
        default:
            if ((target != targ_sub) ||
                ((vship.shp_rflags & RET_DCHRGED) == 0))

diff --git a/src/lib/commands/retr.c b/src/lib/commands/retr.c
index a49fdb91829e9126f125390b9d8525731a0558f4..1ec71ac8ec1ab2ac2551d6a12e5c28fb7a0e54e1 100644 (file)
--- a/src/lib/commands/retr.c
+++ b/src/lib/commands/retr.c
@@ -113,6 +113,7 @@ retr(void)
                break;
            default:
                pr("bad condition\n");
+               /* fall through */
            case '?':
                pr("i\tretreat when injured\n");
                pr("t\tretreat when torped\n");
@@ -245,6 +246,7 @@ lretr(void)
                break;
            default:
                pr("bad condition\n");
+               /* fall through */
            case '?':
                pr("i\tretreat when injured\n");
                pr("h\tretreat when helpless\n");

diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c
index e12de4ad8044487a4f673afeffe589fdc16bcd1b..063457c58907c90f920f1505aed361c287c8cb2f 100644 (file)
--- a/src/lib/subs/mission.c
+++ b/src/lib/subs/mission.c
@@ -849,10 +849,8 @@ nameofitem(s_char *buf, struct genitem *gp, int type)
     switch (type) {
     case EF_SHIP:
        return prship((struct shpstr *)gp);
-       break;
     case EF_PLANE:
        return prplane((struct plnstr *)gp);
-       break;
     case EF_LAND:
        return prland((struct lndstr *)gp);
     }