revert additional patches; committed upstream
authormirabilos <m@mirbsd.org>
Tue, 8 Aug 2017 16:12:33 +0000 (18:12 +0200)
committermirabilos <m@mirbsd.org>
Tue, 8 Aug 2017 16:12:33 +0000 (18:12 +0200)
blocks.c
scrn.c
termcap.c
tty.c

index 64604ab..3d087d4 100644 (file)
--- a/blocks.c
+++ b/blocks.c
@@ -51,21 +51,21 @@ int *msetI(void *dest, int c, int sz)
                sz -= 16;
        }
        switch (sz) {
-       case 15:        d[14] = c;      /* FALLTHROUGH */
-       case 14:        d[13] = c;      /* FALLTHROUGH */
-       case 13:        d[12] = c;      /* FALLTHROUGH */
-       case 12:        d[11] = c;      /* FALLTHROUGH */
-       case 11:        d[10] = c;      /* FALLTHROUGH */
-       case 10:        d[9] = c;       /* FALLTHROUGH */
-       case 9:         d[8] = c;       /* FALLTHROUGH */
-       case 8:         d[7] = c;       /* FALLTHROUGH */
-       case 7:         d[6] = c;       /* FALLTHROUGH */
-       case 6:         d[5] = c;       /* FALLTHROUGH */
-       case 5:         d[4] = c;       /* FALLTHROUGH */
-       case 4:         d[3] = c;       /* FALLTHROUGH */
-       case 3:         d[2] = c;       /* FALLTHROUGH */
-       case 2:         d[1] = c;       /* FALLTHROUGH */
-       case 1:         d[0] = c;       /* FALLTHROUGH */
+       case 15:        d[14] = c;
+       case 14:        d[13] = c;
+       case 13:        d[12] = c;
+       case 12:        d[11] = c;
+       case 11:        d[10] = c;
+       case 10:        d[9] = c;
+       case 9:         d[8] = c;
+       case 8:         d[7] = c;
+       case 7:         d[6] = c;
+       case 6:         d[5] = c;
+       case 5:         d[4] = c;
+       case 4:         d[3] = c;
+       case 3:         d[2] = c;
+       case 2:         d[1] = c;
+       case 1:         d[0] = c;
        case 0:         /* do nothing */;
        }
        return orgd;
@@ -99,21 +99,21 @@ void **msetP(void **d, void *c, int sz)
                sz -= 16;
        }
        switch (sz) {
-       case 15:        d[14] = c;      /* FALLTHROUGH */
-       case 14:        d[13] = c;      /* FALLTHROUGH */
-       case 13:        d[12] = c;      /* FALLTHROUGH */
-       case 12:        d[11] = c;      /* FALLTHROUGH */
-       case 11:        d[10] = c;      /* FALLTHROUGH */
-       case 10:        d[9] = c;       /* FALLTHROUGH */
-       case 9:         d[8] = c;       /* FALLTHROUGH */
-       case 8:         d[7] = c;       /* FALLTHROUGH */
-       case 7:         d[6] = c;       /* FALLTHROUGH */
-       case 6:         d[5] = c;       /* FALLTHROUGH */
-       case 5:         d[4] = c;       /* FALLTHROUGH */
-       case 4:         d[3] = c;       /* FALLTHROUGH */
-       case 3:         d[2] = c;       /* FALLTHROUGH */
-       case 2:         d[1] = c;       /* FALLTHROUGH */
-       case 1:         d[0] = c;       /* FALLTHROUGH */
+       case 15:        d[14] = c;
+       case 14:        d[13] = c;
+       case 13:        d[12] = c;
+       case 12:        d[11] = c;
+       case 11:        d[10] = c;
+       case 10:        d[9] = c;
+       case 9:         d[8] = c;
+       case 8:         d[7] = c;
+       case 7:         d[6] = c;
+       case 6:         d[5] = c;
+       case 5:         d[4] = c;
+       case 4:         d[3] = c;
+       case 3:         d[2] = c;
+       case 2:         d[1] = c;
+       case 1:         d[0] = c;
        case 0:         /* do nothing */;
        }
        return orgd;
@@ -129,21 +129,21 @@ unsigned char *mset(void *dest, unsigned char c, int sz)
 
        if (sz < 16) {
                switch (sz) {
-               case 15:        d[14] = c;      /* FALLTHROUGH */
-               case 14:        d[13] = c;      /* FALLTHROUGH */
-               case 13:        d[12] = c;      /* FALLTHROUGH */
-               case 12:        d[11] = c;      /* FALLTHROUGH */
-               case 11:        d[10] = c;      /* FALLTHROUGH */
-               case 10:        d[9] = c;       /* FALLTHROUGH */
-               case 9:         d[8] = c;       /* FALLTHROUGH */
-               case 8:         d[7] = c;       /* FALLTHROUGH */
-               case 7:         d[6] = c;       /* FALLTHROUGH */
-               case 6:         d[5] = c;       /* FALLTHROUGH */
-               case 5:         d[4] = c;       /* FALLTHROUGH */
-               case 4:         d[3] = c;       /* FALLTHROUGH */
-               case 3:         d[2] = c;       /* FALLTHROUGH */
-               case 2:         d[1] = c;       /* FALLTHROUGH */
-               case 1:         d[0] = c;       /* FALLTHROUGH */
+               case 15:        d[14] = c;
+               case 14:        d[13] = c;
+               case 13:        d[12] = c;
+               case 12:        d[11] = c;
+               case 11:        d[10] = c;
+               case 10:        d[9] = c;
+               case 9:         d[8] = c;
+               case 8:         d[7] = c;
+               case 7:         d[6] = c;
+               case 6:         d[5] = c;
+               case 5:         d[4] = c;
+               case 4:         d[3] = c;
+               case 3:         d[2] = c;
+               case 2:         d[1] = c;
+               case 1:         d[0] = c;
                case 0:         /* do nothing */;
                }
        } else {
@@ -151,13 +151,13 @@ unsigned char *mset(void *dest, unsigned char c, int sz)
 
                if (z != SIZEOF_INT) {
                        switch (z) {
-                       case 7:         d[6] = c;       /* FALLTHROUGH */
-                       case 6:         d[5] = c;       /* FALLTHROUGH */
-                       case 5:         d[4] = c;       /* FALLTHROUGH */
-                       case 4:         d[3] = c;       /* FALLTHROUGH */
-                       case 3:         d[2] = c;       /* FALLTHROUGH */
-                       case 2:         d[1] = c;       /* FALLTHROUGH */
-                       case 1:         d[0] = c;       /* FALLTHROUGH */
+                       case 7:         d[6] = c;
+                       case 6:         d[5] = c;
+                       case 5:         d[4] = c;
+                       case 4:         d[3] = c;
+                       case 3:         d[2] = c;
+                       case 2:         d[1] = c;
+                       case 1:         d[0] = c;
                        case 0:         /* do nothing */;
                        }
                        d += z;
@@ -176,13 +176,13 @@ unsigned char *mset(void *dest, unsigned char c, int sz)
                      c, sz >> SHFT);
                d += sz & ~(SIZEOF_INT - 1);
                switch (sz & (SIZEOF_INT - 1)) {
-               case 7:         d[6] = c;       /* FALLTHROUGH */
-               case 6:         d[5] = c;       /* FALLTHROUGH */
-               case 5:         d[4] = c;       /* FALLTHROUGH */
-               case 4:         d[3] = c;       /* FALLTHROUGH */
-               case 3:         d[2] = c;       /* FALLTHROUGH */
-               case 2:         d[1] = c;       /* FALLTHROUGH */
-               case 1:         d[0] = c;       /* FALLTHROUGH */
+               case 7:         d[6] = c;
+               case 6:         d[5] = c;
+               case 5:         d[4] = c;
+               case 4:         d[3] = c;
+               case 3:         d[2] = c;
+               case 2:         d[1] = c;
+               case 1:         d[0] = c;
                case 0:         /* do nothing */;
                }
        }
@@ -225,21 +225,21 @@ static int *mbkwdI(void *dest, const void *src, int sz)
        d -= sz;
        s -= sz;
        switch (sz) {
-       case 15:        d[14] = s[14];  /* FALLTHROUGH */
-       case 14:        d[13] = s[13];  /* FALLTHROUGH */
-       case 13:        d[12] = s[12];  /* FALLTHROUGH */
-       case 12:        d[11] = s[11];  /* FALLTHROUGH */
-       case 11:        d[10] = s[10];  /* FALLTHROUGH */
-       case 10:        d[9] = s[9];    /* FALLTHROUGH */
-       case 9:         d[8] = s[8];    /* FALLTHROUGH */
-       case 8:         d[7] = s[7];    /* FALLTHROUGH */
-       case 7:         d[6] = s[6];    /* FALLTHROUGH */
-       case 6:         d[5] = s[5];    /* FALLTHROUGH */
-       case 5:         d[4] = s[4];    /* FALLTHROUGH */
-       case 4:         d[3] = s[3];    /* FALLTHROUGH */
-       case 3:         d[2] = s[2];    /* FALLTHROUGH */
-       case 2:         d[1] = s[1];    /* FALLTHROUGH */
-       case 1:         d[0] = s[0];    /* FALLTHROUGH */
+       case 15:        d[14] = s[14];
+       case 14:        d[13] = s[13];
+       case 13:        d[12] = s[12];
+       case 12:        d[11] = s[11];
+       case 11:        d[10] = s[10];
+       case 10:        d[9] = s[9];
+       case 9:         d[8] = s[8];
+       case 8:         d[7] = s[7];
+       case 7:         d[6] = s[6];
+       case 6:         d[5] = s[5];
+       case 5:         d[4] = s[4];
+       case 4:         d[3] = s[3];
+       case 3:         d[2] = s[2];
+       case 2:         d[1] = s[1];
+       case 1:         d[0] = s[0];
        case 0:         /* do nothing */;
        }
        return d;
@@ -279,21 +279,21 @@ static int *mfwrdI(void *dest, const void *src, int sz)
        s -= 15 - sz;
        d -= 15 - sz;
        switch (sz) {
-       case 15:        d[0] = s[0];    /* FALLTHROUGH */
-       case 14:        d[1] = s[1];    /* FALLTHROUGH */
-       case 13:        d[2] = s[2];    /* FALLTHROUGH */
-       case 12:        d[3] = s[3];    /* FALLTHROUGH */
-       case 11:        d[4] = s[4];    /* FALLTHROUGH */
-       case 10:        d[5] = s[5];    /* FALLTHROUGH */
-       case 9:         d[6] = s[6];    /* FALLTHROUGH */
-       case 8:         d[7] = s[7];    /* FALLTHROUGH */
-       case 7:         d[8] = s[8];    /* FALLTHROUGH */
-       case 6:         d[9] = s[9];    /* FALLTHROUGH */
-       case 5:         d[10] = s[10];  /* FALLTHROUGH */
-       case 4:         d[11] = s[11];  /* FALLTHROUGH */
-       case 3:         d[12] = s[12];  /* FALLTHROUGH */
-       case 2:         d[13] = s[13];  /* FALLTHROUGH */
-       case 1:         d[14] = s[14];  /* FALLTHROUGH */
+       case 15:        d[0] = s[0];
+       case 14:        d[1] = s[1];
+       case 13:        d[2] = s[2];
+       case 12:        d[3] = s[3];
+       case 11:        d[4] = s[4];
+       case 10:        d[5] = s[5];
+       case 9:         d[6] = s[6];
+       case 8:         d[7] = s[7];
+       case 7:         d[8] = s[8];
+       case 6:         d[9] = s[9];
+       case 5:         d[10] = s[10];
+       case 4:         d[11] = s[11];
+       case 3:         d[12] = s[12];
+       case 2:         d[13] = s[13];
+       case 1:         d[14] = s[14];
        case 0:         /* do nothing */;
        }
        return od;
@@ -321,13 +321,13 @@ static unsigned char *mbkwd(register unsigned char *d, register const unsigned c
                s -= z;
                d -= z;
                switch (z) {
-               case 7:         d[6] = s[6];    /* FALLTHROUGH */
-               case 6:         d[5] = s[5];    /* FALLTHROUGH */
-               case 5:         d[4] = s[4];    /* FALLTHROUGH */
-               case 4:         d[3] = s[3];    /* FALLTHROUGH */
-               case 3:         d[2] = s[2];    /* FALLTHROUGH */
-               case 2:         d[1] = s[1];    /* FALLTHROUGH */
-               case 1:         d[0] = s[0];    /* FALLTHROUGH */
+               case 7:         d[6] = s[6];
+               case 6:         d[5] = s[5];
+               case 5:         d[4] = s[4];
+               case 4:         d[3] = s[3];
+               case 3:         d[2] = s[2];
+               case 2:         d[1] = s[1];
+               case 1:         d[0] = s[0];
                case 0:         /* do nothing */;
                }
                sz -= z;
@@ -335,13 +335,13 @@ static unsigned char *mbkwd(register unsigned char *d, register const unsigned c
                d -= sz;
                s -= sz;
                switch (sz & (SIZEOF_INT - 1)) {
-               case 7:         d[6] = s[6];    /* FALLTHROUGH */
-               case 6:         d[5] = s[5];    /* FALLTHROUGH */
-               case 5:         d[4] = s[4];    /* FALLTHROUGH */
-               case 4:         d[3] = s[3];    /* FALLTHROUGH */
-               case 3:         d[2] = s[2];    /* FALLTHROUGH */
-               case 2:         d[1] = s[1];    /* FALLTHROUGH */
-               case 1:         d[0] = s[0];    /* FALLTHROUGH */
+               case 7:         d[6] = s[6];
+               case 6:         d[5] = s[5];
+               case 5:         d[4] = s[4];
+               case 4:         d[3] = s[3];
+               case 3:         d[2] = s[2];
+               case 2:         d[1] = s[1];
+               case 1:         d[0] = s[0];
                case 0:         /* do nothing */;
                }
        } else {
@@ -369,21 +369,21 @@ static unsigned char *mbkwd(register unsigned char *d, register const unsigned c
                d -= sz;
                s -= sz;
                switch (sz) {
-               case 15:        d[14] = s[14];  /* FALLTHROUGH */
-               case 14:        d[13] = s[13];  /* FALLTHROUGH */
-               case 13:        d[12] = s[12];  /* FALLTHROUGH */
-               case 12:        d[11] = s[11];  /* FALLTHROUGH */
-               case 11:        d[10] = s[10];  /* FALLTHROUGH */
-               case 10:        d[9] = s[9];    /* FALLTHROUGH */
-               case 9:         d[8] = s[8];    /* FALLTHROUGH */
-               case 8:         d[7] = s[7];    /* FALLTHROUGH */
-               case 7:         d[6] = s[6];    /* FALLTHROUGH */
-               case 6:         d[5] = s[5];    /* FALLTHROUGH */
-               case 5:         d[4] = s[4];    /* FALLTHROUGH */
-               case 4:         d[3] = s[3];    /* FALLTHROUGH */
-               case 3:         d[2] = s[2];    /* FALLTHROUGH */
-               case 2:         d[1] = s[1];    /* FALLTHROUGH */
-               case 1:         d[0] = s[0];    /* FALLTHROUGH */
+               case 15:        d[14] = s[14];
+               case 14:        d[13] = s[13];
+               case 13:        d[12] = s[12];
+               case 12:        d[11] = s[11];
+               case 11:        d[10] = s[10];
+               case 10:        d[9] = s[9];
+               case 9:         d[8] = s[8];
+               case 8:         d[7] = s[7];
+               case 7:         d[6] = s[6];
+               case 6:         d[5] = s[5];
+               case 5:         d[4] = s[4];
+               case 4:         d[3] = s[3];
+               case 3:         d[2] = s[2];
+               case 2:         d[1] = s[1];
+               case 1:         d[0] = s[0];
                case 0:         /* do nothing */;
                }
        }
@@ -414,23 +414,23 @@ static unsigned char *mfwrd(register unsigned char *d, register const unsigned c
                        d -= z;
                        switch (SIZEOF_INT - z) {
 #if SIZEOF_INT == 8
-                       case 7:         d[1] = s[1];    /* FALLTHROUGH */
-                       case 6:         d[2] = s[2];    /* FALLTHROUGH */
-                       case 5:         d[3] = s[3];    /* FALLTHROUGH */
-                       case 4:         d[4] = s[4];    /* FALLTHROUGH */
-                       case 3:         d[5] = s[5];    /* FALLTHROUGH */
-                       case 2:         d[6] = s[6];    /* FALLTHROUGH */
-                       case 1:         d[7] = s[7];    /* FALLTHROUGH */
+                       case 7:         d[1] = s[1];
+                       case 6:         d[2] = s[2];
+                       case 5:         d[3] = s[3];
+                       case 4:         d[4] = s[4];
+                       case 3:         d[5] = s[5];
+                       case 2:         d[6] = s[6];
+                       case 1:         d[7] = s[7];
                        case 0:         /* do nothing */;
 #else
 #if SIZEOF_INT == 4
-                       case 3:         d[1] = s[1];    /* FALLTHROUGH */
-                       case 2:         d[2] = s[2];    /* FALLTHROUGH */
-                       case 1:         d[3] = s[3];    /* FALLTHROUGH */
+                       case 3:         d[1] = s[1];
+                       case 2:         d[2] = s[2];
+                       case 1:         d[3] = s[3];
                        case 0:         /* do nothing */;
 #else
 #if SIZEOF_INT == 2
-                       case 1:         d[1] = s[1];    /* FALLTHROUGH */
+                       case 1:         d[1] = s[1];
                        case 0:         /* do nothing */;
 #endif
 #endif
@@ -445,23 +445,23 @@ static unsigned char *mfwrd(register unsigned char *d, register const unsigned c
                d += sz - (SIZEOF_INT - 1);
                switch (sz & (SIZEOF_INT - 1)) {
 #if SIZEOF_INT == 8
-               case 7:         d[0] = s[0];    /* FALLTHROUGH */
-               case 6:         d[1] = s[1];    /* FALLTHROUGH */
-               case 5:         d[2] = s[2];    /* FALLTHROUGH */
-               case 4:         d[3] = s[3];    /* FALLTHROUGH */
-               case 3:         d[4] = s[4];    /* FALLTHROUGH */
-               case 2:         d[5] = s[5];    /* FALLTHROUGH */
-               case 1:         d[6] = s[6];    /* FALLTHROUGH */
+               case 7:         d[0] = s[0];
+               case 6:         d[1] = s[1];
+               case 5:         d[2] = s[2];
+               case 4:         d[3] = s[3];
+               case 3:         d[4] = s[4];
+               case 2:         d[5] = s[5];
+               case 1:         d[6] = s[6];
                case 0:         /* do nothing */;
 #else
 #if SIZEOF_INT == 4
-               case 3:         d[0] = s[0];    /* FALLTHROUGH */
-               case 2:         d[1] = s[1];    /* FALLTHROUGH */
-               case 1:         d[2] = s[2];    /* FALLTHROUGH */
+               case 3:         d[0] = s[0];
+               case 2:         d[1] = s[1];
+               case 1:         d[2] = s[2];
                case 0:         /* do nothing */;
 #else
 #if SIZEOF_INT == 2
-               case 1:         d[0] = s[0];    /* FALLTHROUGH */
+               case 1:         d[0] = s[0];
                case 0:         /* do nothing */;
 #endif
 #endif
@@ -492,21 +492,21 @@ static unsigned char *mfwrd(register unsigned char *d, register const unsigned c
                s -= 15 - sz;
                d -= 15 - sz;
                switch (sz) {
-               case 15:        d[0] = s[0];    /* FALLTHROUGH */
-               case 14:        d[1] = s[1];    /* FALLTHROUGH */
-               case 13:        d[2] = s[2];    /* FALLTHROUGH */
-               case 12:        d[3] = s[3];    /* FALLTHROUGH */
-               case 11:        d[4] = s[4];    /* FALLTHROUGH */
-               case 10:        d[5] = s[5];    /* FALLTHROUGH */
-               case 9:         d[6] = s[6];    /* FALLTHROUGH */
-               case 8:         d[7] = s[7];    /* FALLTHROUGH */
-               case 7:         d[8] = s[8];    /* FALLTHROUGH */
-               case 6:         d[9] = s[9];    /* FALLTHROUGH */
-               case 5:         d[10] = s[10];  /* FALLTHROUGH */
-               case 4:         d[11] = s[11];  /* FALLTHROUGH */
-               case 3:         d[12] = s[12];  /* FALLTHROUGH */
-               case 2:         d[13] = s[13];  /* FALLTHROUGH */
-               case 1:         d[14] = s[14];  /* FALLTHROUGH */
+               case 15:        d[0] = s[0];
+               case 14:        d[1] = s[1];
+               case 13:        d[2] = s[2];
+               case 12:        d[3] = s[3];
+               case 11:        d[4] = s[4];
+               case 10:        d[5] = s[5];
+               case 9:         d[6] = s[6];
+               case 8:         d[7] = s[7];
+               case 7:         d[8] = s[8];
+               case 6:         d[9] = s[9];
+               case 5:         d[10] = s[10];
+               case 4:         d[11] = s[11];
+               case 3:         d[12] = s[12];
+               case 2:         d[13] = s[13];
+               case 1:         d[14] = s[14];
                case 0:         /* do nothing */;
                }
        }
@@ -549,21 +549,21 @@ int mcnt(register unsigned char *blk, register unsigned char c, int size)
                size -= 16;
        }
        switch (size) {
-       case 15:        if (blk[14] == c) ++nlines;     /* FALLTHROUGH */
-       case 14:        if (blk[13] == c) ++nlines;     /* FALLTHROUGH */
-       case 13:        if (blk[12] == c) ++nlines;     /* FALLTHROUGH */
-       case 12:        if (blk[11] == c) ++nlines;     /* FALLTHROUGH */
-       case 11:        if (blk[10] == c) ++nlines;     /* FALLTHROUGH */
-       case 10:        if (blk[9] == c) ++nlines;      /* FALLTHROUGH */
-       case 9:         if (blk[8] == c) ++nlines;      /* FALLTHROUGH */
-       case 8:         if (blk[7] == c) ++nlines;      /* FALLTHROUGH */
-       case 7:         if (blk[6] == c) ++nlines;      /* FALLTHROUGH */
-       case 6:         if (blk[5] == c) ++nlines;      /* FALLTHROUGH */
-       case 5:         if (blk[4] == c) ++nlines;      /* FALLTHROUGH */
-       case 4:         if (blk[3] == c) ++nlines;      /* FALLTHROUGH */
-       case 3:         if (blk[2] == c) ++nlines;      /* FALLTHROUGH */
-       case 2:         if (blk[1] == c) ++nlines;      /* FALLTHROUGH */
-       case 1:         if (blk[0] == c) ++nlines;      /* FALLTHROUGH */
+       case 15:        if (blk[14] == c) ++nlines;
+       case 14:        if (blk[13] == c) ++nlines;
+       case 13:        if (blk[12] == c) ++nlines;
+       case 12:        if (blk[11] == c) ++nlines;
+       case 11:        if (blk[10] == c) ++nlines;
+       case 10:        if (blk[9] == c) ++nlines;
+       case 9:         if (blk[8] == c) ++nlines;
+       case 8:         if (blk[7] == c) ++nlines;
+       case 7:         if (blk[6] == c) ++nlines;
+       case 6:         if (blk[5] == c) ++nlines;
+       case 5:         if (blk[4] == c) ++nlines;
+       case 4:         if (blk[3] == c) ++nlines;
+       case 3:         if (blk[2] == c) ++nlines;
+       case 2:         if (blk[1] == c) ++nlines;
+       case 1:         if (blk[0] == c) ++nlines;
        case 0:         /* do nothing */;
        }
        return nlines;
diff --git a/scrn.c b/scrn.c
index 083afb7..a26d2eb 100644 (file)
--- a/scrn.c
+++ b/scrn.c
@@ -213,7 +213,6 @@ void outatr(struct charmap *map,SCRN *t,int *scrn,int *attrf,int xx,int yy,int c
                                break;
                        case 1:
                                c ^= 0x40;
-                               /* FALLTHROUGH */
                        default:
                                a ^= UNDERLINE;
                                break;
@@ -1029,7 +1028,6 @@ static void cposs(register SCRN *t, register int x, register int y)
                texec(t->cap, t->ho, 1, 0, 0, 0, 0);
                t->x = 0;
                t->y = hy;
-               /* FALLTHROUGH */
  doch:
                /* FALLTHROUGH */
        case 4:
@@ -1049,7 +1047,6 @@ static void cposs(register SCRN *t, register int x, register int y)
        case 8:
                texec(t->cap, t->cr, 1, 0, 0, 0, 0);
                t->x = 0;
-               /* FALLTHROUGH */
  docv:
                /* FALLTHROUGH */
        case 5:
index c918970..faf3d6a 100644 (file)
--- a/termcap.c
+++ b/termcap.c
@@ -571,11 +571,9 @@ void texec(CAP *cap, unsigned char *s, int l, int a0, int a1, int a2, int a3)
                                        cap->out(cap->outptr, x / 96);
                                        x %= 96;
                                }
-                               /* FALLTHROUGH */
                        case '+':
                                if (*s)
                                        x += escape(&s);
-                               /* FALLTHROUGH */
                        case '.':
                                cap->out(cap->outptr, x);
                                ++a;
@@ -583,11 +581,9 @@ void texec(CAP *cap, unsigned char *s, int l, int a0, int a1, int a2, int a3)
                        case 'd':
                                if (x < 10)
                                        goto one;
-                               /* FALLTHROUGH */
                        case '2':
                                if (x < 100)
                                        goto two;
-                               /* FALLTHROUGH */
                        case '3':
                                c = '0';
                                while (x >= 100) {
@@ -595,8 +591,7 @@ void texec(CAP *cap, unsigned char *s, int l, int a0, int a1, int a2, int a3)
                                        x -= 100;
                                }
                                cap->out(cap->outptr, c);
- two:
-                               c = '0';
+                             two:c = '0';
                                while (x >= 10) {
                                        ++c;
                                        x -= 10;
@@ -669,7 +664,6 @@ void texec(CAP *cap, unsigned char *s, int l, int a0, int a1, int a2, int a3)
                                        a[0] += escape(&s);
                                else
                                        escape(&s);
-                               /* FALLTHROUGH */
                        default:
                                cap->out(cap->outptr, '%');
                                cap->out(cap->outptr, c);
diff --git a/tty.c b/tty.c
index 11a5dad..310995b 100644 (file)
--- a/tty.c
+++ b/tty.c
@@ -408,7 +408,7 @@ baud_reset(int bbaud)
        upc = DIVIDEND / baud;
        if (obuf)
                joe_free(obuf);
-       if ((TIMES * upc) == 0)
+       if (!(TIMES * upc))
                obufsiz = 4096;
        else {
                obufsiz = 1000000 / (TIMES * upc);