Added /* FALLTHRU */ comments where gcc 7 noticed their need.

And replaced similar comments to be consistent.  Used that comment
because it satisfies gcc -Wimplicit-fallthrough=4.

diff --git a/config/config.c b/config/config.c
index 020d610d4d38fc609b24b7c5467283bf0983fb95..81c3683fff1ba0178d9cf46a46582ee79bd18199 100644 (file)
--- a/config/config.c
+++ b/config/config.c
@@ -63,7 +63,8 @@ etcpath (char *file)
                *--cp = '/';
 
            if (access (epath, R_OK) != NOTOK)
                *--cp = '/';
 
            if (access (epath, R_OK) != NOTOK)

-               return epath;   /* else fall */
+               return epath;
+               /* FALLTHRU */

 try_it:
 
        default: 
 try_it:
 
        default: 

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 77bcb6e544df97bb8fceb618a62703ee9fe9097a..78f8355680d0c14ab811b0a1265b342afcc26483 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -623,7 +623,8 @@ sm_end (int type)
        case NOTOK: 
            sm_note.code = sm_reply.code;
            sm_note.length = sm_reply.length;
        case NOTOK: 
            sm_note.code = sm_reply.code;
            sm_note.length = sm_reply.length;

-           memcpy (sm_note.text, sm_reply.text, sm_reply.length + 1);/* fall */
+           memcpy (sm_note.text, sm_reply.text, sm_reply.length + 1);
+           /* FALLTHRU */

        case DONE: 
            if (smtalk (SM_RSET, "RSET") == 250 && type == DONE)
                return RP_OK;
        case DONE: 
            if (smtalk (SM_RSET, "RSET") == 250 && type == DONE)
                return RP_OK;


@@ -764,7 +765,8 @@ sm_wstream (char *buffer, int len)
                    if (netsec_write(nsc, ".", 1, &errstr) != OK) {
                    sm_nerror(errstr);
                    return NOTOK;
                    if (netsec_write(nsc, ".", 1, &errstr) != OK) {
                    sm_nerror(errstr);
                    return NOTOK;

-               } /* FALL THROUGH */
+               }
+               /* FALLTHRU */

 
            default: 
                sm_nl = FALSE;
 
            default: 
                sm_nl = FALSE;

diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c
index bb6c4f0bc1df16df35c5bf851cfc144b63a1da37..49953f61de73f9b0ee68a4bab790b6c7ad7cbddd 100644 (file)
--- a/sbr/addrsbr.c
+++ b/sbr/addrsbr.c
@@ -385,7 +385,8 @@ ismymbox (struct mailname *np)
 
            case UUCPHOST:
                if (strcasecmp (np->m_host, SystemName()))
 
            case UUCPHOST:
                if (strcasecmp (np->m_host, SystemName()))

-                   break;              /* fall */
+                   break;
+                   /* FALLTHRU */

            case LOCALHOST:
 local_test: ;
                if (!strcasecmp (np->m_mbox, mq.m_mbox))
            case LOCALHOST:
 local_test: ;
                if (!strcasecmp (np->m_mbox, mq.m_mbox))

diff --git a/sbr/cpydgst.c b/sbr/cpydgst.c
index 55df3fc68d0ee3a14b4eb913e41e0e1daed908a1..53923b2a5d380643d1e76522bdf48af7cbedaeb9 100644 (file)
--- a/sbr/cpydgst.c
+++ b/sbr/cpydgst.c
@@ -51,8 +51,8 @@ cpydgst (int in, int out, char *ifile, char *ofile)
                        output ('-');
                        output (' ');
                    }
                        output ('-');
                        output (' ');
                    }

-                   state = S2; /* fall */
-
+                   state = S2;
+                   /* FALLTHRU */

                case S2: 
                    output (*cp);
                    if (*cp == '\n')
                case S2: 
                    output (*cp);
                    if (*cp == '\n')

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index c8618ed886ab289ed48753faf858d30b284d0ff1..f7fcff2b6afd545ae9ca9a732c4d342e65660677 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -578,7 +578,7 @@ do_name(char *sp, int preprocess)
            ismymbox ((struct mailname *) 0);
            primed++;
        }
            ismymbox ((struct mailname *) 0);
            primed++;
        }

-       /* fall through */
+       /* FALLTHRU */

     case FT_PARSEADDR:
        if (cm->c_type & CT_DATE) {
            CERROR("component used as both date and address");
     case FT_PARSEADDR:
        if (cm->c_type & CT_DATE) {
            CERROR("component used as both date and address");


@@ -740,7 +740,7 @@ do_func(char *sp)
 
     case TF_EXPR_SV:
        LV(FT_SAVESTR, 0);
 
     case TF_EXPR_SV:
        LV(FT_SAVESTR, 0);

-       /* fall through */
+       /* FALLTHRU */

     case TF_EXPR:
        *--cp = c;
        cp = do_expr(cp, t->extra);
     case TF_EXPR:
        *--cp = c;
        cp = do_expr(cp, t->extra);

diff --git a/sbr/fmt_new.c b/sbr/fmt_new.c
index 18f48987fb890fae7a4be8b7268fe62fb5c507a0..e5de56f2e74bebf401beef04c7a45d2189fe2703 100644 (file)
--- a/sbr/fmt_new.c
+++ b/sbr/fmt_new.c
@@ -102,7 +102,8 @@ normalize (char *cp)
                    break;
 
                case 0: 
                    break;
 
                case 0: 

-                   cp--;       /* fall */
+                   cp--;
+                   /* FALLTHRU */

                default: 
                    *dp++ = *cp;
                    break;
                default: 
                    *dp++ = *cp;
                    break;

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index f640a2aab7e1251a7b85ac14d6b6dc90e9cdd820..4976b1c5faff005470361f560638a662a6bbde22 100644 (file)
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -606,7 +606,7 @@ m_getfld (m_getfld_state_t *gstate, char name[NAMESZ], char *buf, int *bufsz,
            while (isspace ((unsigned char) *--cp) && cp >= name) continue;
            *++cp = 0;
            /* readpos points to the first character of the field body. */
            while (isspace ((unsigned char) *--cp) && cp >= name) continue;
            *++cp = 0;
            /* readpos points to the first character of the field body. */

-           /* fall through */
+           /* FALLTHRU */

 
        case FLDPLUS: {
            /*
 
        case FLDPLUS: {
            /*

diff --git a/sbr/mf.c b/sbr/mf.c
index 084643b49ad7a3e235d4f0b926d30041b48ac71a..a604ce918b94b533a6c52d80ef9d499bf30e8b0a 100644 (file)
--- a/sbr/mf.c
+++ b/sbr/mf.c
@@ -288,6 +288,7 @@ again: ;
                strcpy (err, "extraneous semi-colon");
                return NOTOK;
            }
                strcpy (err, "extraneous semi-colon");
                return NOTOK;
            }

+           /* FALLTHRU */

        case LX_COMA: 
             mh_xfree(note);
             note = NULL;
        case LX_COMA: 
             mh_xfree(note);
             note = NULL;


@@ -391,6 +392,7 @@ again: ;
                        strcpy (err, "extraneous semi-colon");
                        return NOTOK;
                    }
                        strcpy (err, "extraneous semi-colon");
                        return NOTOK;
                    }

+                   /* FALLTHRU */

                case LX_COMA: 
                case LX_END: 
                    return OK;
                case LX_COMA: 
                case LX_END: 
                    return OK;


@@ -623,6 +625,7 @@ my_lex (char *buffer)
                    continue;
                case '(': 
                    i++;
                    continue;
                case '(': 
                    i++;

+                   /* FALLTHRU */

                default: 
                    ADDCHR(c);
                    continue;
                default: 
                    ADDCHR(c);
                    continue;


@@ -650,6 +653,7 @@ my_lex (char *buffer)
                        cp = NULL;
                        return (last_lex = LX_ERR);
                    }
                        cp = NULL;
                        return (last_lex = LX_ERR);
                    }

+                   /* FALLTHRU */

                default: 
                    ADDCHR(c);
                    continue;
                default: 
                    ADDCHR(c);
                    continue;


@@ -673,6 +677,7 @@ my_lex (char *buffer)
                        cp = NULL;
                        return (last_lex = LX_ERR);
                    }
                        cp = NULL;
                        return (last_lex = LX_ERR);
                    }

+                   /* FALLTHRU */

                default: 
                    ADDCHR(c);
                    continue;
                default: 
                    ADDCHR(c);
                    continue;


@@ -781,7 +786,8 @@ mfgets (FILE *in, char **bp)
                    case '\t': 
                        *cp++ = '\n';
                        break;
                    case '\t': 
                        *cp++ = '\n';
                        break;

-               }               /* fall into default case */
+               }
+               /* FALLTHRU */

 
            default: 
                *cp++ = i;
 
            default: 
                *cp++ = i;

diff --git a/sbr/mts.c b/sbr/mts.c
index 285ced5dd5ae3c177e6f2a1a658bcff6cb7fd57c..9db81061009e31d6ea1658079a24c7e2217c8b48 100644 (file)
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -182,6 +182,7 @@ tailor_value (char *s)
                case 't': *bp = '\t'; break;
 
                case 0: s--;
                case 't': *bp = '\t'; break;
 
                case 0: s--;

+                   /* FALLTHRU */

                case QUOTE: 
                    *bp = QUOTE;
                    break;
                case QUOTE: 
                    *bp = QUOTE;
                    break;

diff --git a/sbr/ruserpass.c b/sbr/ruserpass.c
index 9784e89e0f588d29cebcf561e86f04f43cf5684c..2bd8d63e0362a058891e36c7d42fc0bc8711a654 100644 (file)
--- a/sbr/ruserpass.c
+++ b/sbr/ruserpass.c
@@ -80,7 +80,7 @@ ruserpass(const char *host, char **aname, char **apass, int flags)
            switch(t) {
            case DEFAULT:
                usedefault = 1;
            switch(t) {
            case DEFAULT:
                usedefault = 1;

-               /* FALL THROUGH */
+               /* FALLTHRU */

 
            case MACH:
                if (!usedefault) {
 
            case MACH:
                if (!usedefault) {

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index 8b58639a3ea17993fd4048626eb31bc6c1c6723f..20ba5cff6f376baac5c35c0906df28cb2133abc9 100644 (file)
--- a/sbr/seq_read.c
+++ b/sbr/seq_read.c
@@ -104,7 +104,7 @@ seq_public (struct msgs *mp, int lockflag, int *failed_to_lock)
            case BODY:
                lkfclosedata (fp, seqfile);
                adios (NULL, "no blank lines are permitted in %s", seqfile);
            case BODY:
                lkfclosedata (fp, seqfile);
                adios (NULL, "no blank lines are permitted in %s", seqfile);

-               /* fall */
+               /* FALLTHRU */

 
            case FILEEOF:
                break;
 
            case FILEEOF:
                break;

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index e9724f73d630099f2b647a95bdaca907fbb805cb..015f48a428ce076f3cacff8cc3843ec201744fbf 100644 (file)
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -202,7 +202,7 @@ alias (char *file)
                    fclose (fp);
                    return i;
                }
                    fclose (fp);
                    return i;
                }

-
+               /* FALLTHRU */

            case ':':           /* comment */
            case ';': 
            case '#':
            case ':':           /* comment */
            case ';': 
            case '#':

diff --git a/uip/burst.c b/uip/burst.c
index 49dad2d1ff76b5d2ad9e2b3579b4d676f8ee2576..ab2a9e5d8796bd0d29e7533a3a720b5cd13591ec 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -521,6 +521,7 @@ cpybrst (FILE *in, FILE *out, char *ifile, char *ofile, int len, int mime)
 
                    default: 
                        state = S2;
 
                    default: 
                        state = S2;

+                       /* FALLTHRU */

                    case '\n': 
                        fputc (c, out);
                        break;
                    case '\n': 
                        fputc (c, out);
                        break;


@@ -531,6 +532,7 @@ cpybrst (FILE *in, FILE *out, char *ifile, char *ofile, int len, int mime)
                switch (c) {
                    case '\n': 
                        state = S1;
                switch (c) {
                    case '\n': 
                        state = S1;

+                       /* FALLTHRU */

                    default: 
                        fputc (c, out);
                        break;
                    default: 
                        fputc (c, out);
                        break;

diff --git a/uip/comp.c b/uip/comp.c
index a018d7438f4d92836f67508d07848ff466040ab5..7ca48dbca36c4bb85f06c4055e7d8d38dff33b78 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -123,7 +123,7 @@ main (int argc, char **argv)
 
                case BILDSW:
                    build++;
 
                case BILDSW:
                    build++;

-                   /* fall through */
+                   /* FALLTHRU */

                case NWHATSW: 
                    nwhat++;
                    continue;
                case NWHATSW: 
                    nwhat++;
                    continue;

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 9a6e351c3e6acb5c18c63297f941e7c8a74bc22d..a23c21c1c6002e079e19586733e3af12b755b0a8 100644 (file)
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -266,6 +266,7 @@ dumpone(struct format *fmt)
        case FT_IF_MATCH:
        case FT_IF_AMATCH:
                printf(" continue else goto");
        case FT_IF_MATCH:
        case FT_IF_AMATCH:
                printf(" continue else goto");

+               /* FALLTHRU */

        case FT_GOTO:
                i = findlabel(fmt + fmt->f_skip);
                printf(" L%d", i);
        case FT_GOTO:
                i = findlabel(fmt + fmt->f_skip);
                printf(" L%d", i);

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 80b73d92fa41072fe9a9e0c95975fce84c4a0710..cb4c82eaae8d5fc5e1440a6ea2579de9e53ef778 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -649,7 +649,7 @@ process_single_file(FILE *in, struct msgs_array *comps, int *dat, int msgsize,
 
                fmt_addcomptext("body", rbuf);
            }
 
                fmt_addcomptext("body", rbuf);
            }

-           /* fall through */
+           /* FALLTHRU */

 
        default:
            goto finished;
 
        default:
            goto finished;


@@ -894,6 +894,7 @@ dumpone(struct format *fmt)
        case FT_IF_MATCH:
        case FT_IF_AMATCH:
                printf(" continue else goto");
        case FT_IF_MATCH:
        case FT_IF_AMATCH:
                printf(" continue else goto");

+               /* FALLTHRU */

        case FT_GOTO:
                i = findlabel(fmt + fmt->f_skip);
                printf(" L%d", i);
        case FT_GOTO:
                i = findlabel(fmt + fmt->f_skip);
                printf(" L%d", i);

diff --git a/uip/forw.c b/uip/forw.c
index 5b4d90145d204ddafdd1d927ba2873ac517a9455..501f65134766511cfa9d47d6e408c9298034296a 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -163,7 +163,8 @@ main (int argc, char **argv)
                    nwhat = 0;
                    continue;
                case BILDSW:
                    nwhat = 0;
                    continue;
                case BILDSW:

-                   buildsw++;  /* fall... */
+                   buildsw++;
+                   /* FALLTHRU */

                case NWHATSW: 
                    nwhat++;
                    continue;
                case NWHATSW: 
                    nwhat++;
                    continue;

diff --git a/uip/inc.c b/uip/inc.c
index b32b3e1f1f1eff0c6cb3f64dd7432fb72d6309a8..1973a6af959cf1eaa4828194bfa8e66e47f1a8ae 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -690,7 +690,7 @@ go_to_it:
                trnflag = 0;
                noisy++;
                /* advise (cp, "unable to read"); already advised */
                trnflag = 0;
                noisy++;
                /* advise (cp, "unable to read"); already advised */

-               /* fall thru */
+               /* FALLTHRU */

 
            case SCNERR:
            case SCNNUM:
 
            case SCNERR:
            case SCNNUM:


@@ -851,7 +851,7 @@ go_to_it:
                trnflag = 0;
                noisy++;
                /* advise (cp, "unable to read"); already advised */
                trnflag = 0;
                noisy++;
                /* advise (cp, "unable to read"); already advised */

-               /* fall thru */
+               /* FALLTHRU */

 
            case SCNERR:
            case SCNNUM:
 
            case SCNERR:
            case SCNNUM:

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 2639043b7aebabedc01209aca6657df0c4334b48..c8b8799ccf8c32fc1cd982b6c6a1bd2bc8850fac 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -343,7 +343,7 @@ finish_field:
 
        case BODY:
            fseek (in, (long) (-strlen (buf)), SEEK_CUR);
 
        case BODY:
            fseek (in, (long) (-strlen (buf)), SEEK_CUR);

-           /* fall through */
+           /* FALLTHRU */

        case FILEEOF:
            break;
 
        case FILEEOF:
            break;
 


@@ -809,7 +809,7 @@ rock_and_roll:
                ct->c_encoding = CE_7BIT;
                goto call_init;
            }
                ct->c_encoding = CE_7BIT;
                goto call_init;
            }

-           /* else fall... */
+           /* FALLTHRU */

        case CT_MULTIPART:
            adios (NULL, "it doesn't make sense to define an in-line %s content",
                   ct->c_type == CT_MESSAGE ? "message" : "multipart");
        case CT_MULTIPART:
            adios (NULL, "it doesn't make sense to define an in-line %s content",
                   ct->c_type == CT_MESSAGE ? "message" : "multipart");


@@ -1288,7 +1288,7 @@ compose_content (CT ct, int verbose)
                    case 'F':
                        /* %f, and stdout is not-redirected */
                        xstdout = 1;
                    case 'F':
                        /* %f, and stdout is not-redirected */
                        xstdout = 1;

-                       /* and fall... */
+                       /* FALLTHRU */

 
                    case 'f':
                        /*
 
                    case 'f':
                        /*


@@ -2017,7 +2017,7 @@ setup_attach_content(CT ct, char *filename)
        if (strcasecmp(ct->c_ctinfo.ci_subtype, "external-body") == 0)
            adios(NULL, "external-body messages must be specified "
                "by mhbuild directives");
        if (strcasecmp(ct->c_ctinfo.ci_subtype, "external-body") == 0)
            adios(NULL, "external-body messages must be specified "
                "by mhbuild directives");

-       /* Fall through */
+       /* FALLTHRU */

 
     default:
        /*
 
     default:
        /*

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 329ad79e4ab31d7b986440225220cfe4c612f728..f07d786dae3dbcd53123d150d2ec1963b770545f 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -361,16 +361,20 @@ mhl (int argc, char **argv)
                case AMBIGSW: 
                    ambigsw (cp, mhlswitches);
                    mhldone (1);
                case AMBIGSW: 
                    ambigsw (cp, mhlswitches);
                    mhldone (1);

+                   /* FALLTHRU */

                case UNKWNSW: 
                    mhladios (NULL, "-%s unknown\n", cp);
                case UNKWNSW: 
                    mhladios (NULL, "-%s unknown\n", cp);

+                   /* FALLTHRU */

 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [switches] [files ...]", invo_name);
                    print_help (buf, mhlswitches, 1);
                    mhldone (0);
 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [switches] [files ...]", invo_name);
                    print_help (buf, mhlswitches, 1);
                    mhldone (0);

+                   /* FALLTHRU */

                case VERSIONSW:
                    print_version(invo_name);
                    mhldone (0);
                case VERSIONSW:
                    print_version(invo_name);
                    mhldone (0);

+                   /* FALLTHRU */

 
                case BELLSW: 
                    bellflg = 1;
 
                case BELLSW: 
                    bellflg = 1;


@@ -449,7 +453,8 @@ mhl (int argc, char **argv)
                    continue;
 
                case FORW2SW: 
                    continue;
 
                case FORW2SW: 

-                   forwall++;  /* fall */
+                   forwall++;
+                   /* FALLTHRU */

                case FORW1SW: 
                    forwflg++;
                    clearflg = -1;/* XXX */
                case FORW1SW: 
                    forwflg++;
                    clearflg = -1;/* XXX */


@@ -900,7 +905,7 @@ process (char *folder, char *fname, int ofilen, int ofilec)
            cp = folder ? concat (folder, ":", fname2, NULL) : mh_xstrdup(fname2);
            if (ontty != PITTY)
                SIGNAL (SIGINT, intrser);
            cp = folder ? concat (folder, ":", fname2, NULL) : mh_xstrdup(fname2);
            if (ontty != PITTY)
                SIGNAL (SIGINT, intrser);

-           mhlfile (fp, cp, ofilen, ofilec);  /* FALL THROUGH! */
+           mhlfile (fp, cp, ofilen, ofilec);

             free (cp);
 
            for (ap = arglist_head; ap; ap = ap->a_next) {
             free (cp);
 
            for (ap = arglist_head; ap; ap = ap->a_next) {


@@ -909,7 +914,8 @@ process (char *folder, char *fname, int ofilen, int ofilec)
            }
 
            if (arglist_head)
            }
 
            if (arglist_head)

-               fmt_free(NULL, 1);
+               fmt_free(NULL, 1);
+           /* FALLTHRU */

 
        default:
            if (ontty != PITTY)
 
        default:
            if (ontty != PITTY)

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 85c3292443097a9f8df0b31dd0b6199f2492048c..5db4efedd6f6645d42fb7b92d3985296b8b69af4 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -960,7 +960,7 @@ invalid:
 
        case '(':
            i++;
 
        case '(':
            i++;

-           /* and fall... */
+           /* FALLTHRU */

        default:
            *bp++ = c;
            continue;
        default:
            *bp++ = c;
            continue;


@@ -1531,7 +1531,7 @@ no_body:
                    case CT_MESSAGE:
                        if (p->c_subtype != MESSAGE_RFC822)
                            break;
                    case CT_MESSAGE:
                        if (p->c_subtype != MESSAGE_RFC822)
                            break;

-                       /* else fall... */
+                       /* FALLTHRU */

                    default:
                        e->eb_partno = ct->c_partno;
                        if (p->c_ctinitfnx)
                    default:
                        e->eb_partno = ct->c_partno;
                        if (p->c_ctinitfnx)


@@ -3479,7 +3479,7 @@ bad_quote:
                    case '\\':
                        if (*++cp == '\0')
                            goto bad_quote;
                    case '\\':
                        if (*++cp == '\0')
                            goto bad_quote;

-                       /* FALL THROUGH */
+                       /* FALLTHRU */

                    default:
                        len++;
                        continue;
                    default:
                        len++;
                        continue;


@@ -3931,7 +3931,7 @@ param_len(PM pm, int index, size_t valueoff, int *encode, int *cont,
            case '\\':
                len++;
                maxfit--;
            case '\\':
                len++;
                maxfit--;

-           /* FALL THROUGH */
+           /* FALLTHRU */

            default:
                len++;
                maxfit--;
            default:
                len++;
                maxfit--;


@@ -4039,6 +4039,7 @@ normal_param(PM pm, char *output, size_t len, size_t valuelen,
        case '"':
            *output++ = '\\';
            outlen++;
        case '"':
            *output++ = '\\';
            outlen++;

+           /* FALLTHRU */

        default:
            *output++ = *p++;
            outlen++;
        default:
            *output++ = *p++;
            outlen++;

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 7298f5b0435e93283f8ee7bd8780b4bbad9f8403..6b2efa8838823bebf80f852d202a3f8a0b914839 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -844,7 +844,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
            case 'F':
                /* %f, and stdin is terminal not content */
                *xstdin = 1;
            case 'F':
                /* %f, and stdin is terminal not content */
                *xstdin = 1;

-               /* and fall... */
+               /* FALLTHRU */

 
            case 'f':
                if (multipart) {
 
            case 'f':
                if (multipart) {


@@ -898,7 +898,7 @@ parse_display_string (CT ct, char *cp, int *xstdin, int *xlist,
 
            case 'p':
                /* No longer supported */
 
            case 'p':
                /* No longer supported */

-               /* and fall... */
+               /* FALLTHRU */

 
            case 'l':
                /* display listing prior to displaying content */
 
            case 'l':
                /* display listing prior to displaying content */

diff --git a/uip/new.c b/uip/new.c
index 7a1f234707991701d972c55d60fc9d7361ef9b74..e2fe81cc0a9ad25ab92facc784ca227918630cb6 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -178,7 +178,7 @@ get_msgnums(char *folder, char *sequences[])
 
             case BODY:
                 adios (NULL, "no blank lines are permitted in %s", seqfile);
 
             case BODY:
                 adios (NULL, "no blank lines are permitted in %s", seqfile);

-                /* fall */
+               /* FALLTHRU */

 
             case FILEEOF:
                 break;
 
             case FILEEOF:
                 break;

diff --git a/uip/picksbr.c b/uip/picksbr.c
index 3d9c5b5b8ccdf7f487a0987227dae1afc407dafa..6faa108ffcef4973ed3b27ae15722000b43d6a01 100644 (file)
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -633,6 +633,7 @@ gcompile (struct nexus *n, char *astr)
            case '\\': 
                if ((c = *sp++) == '\0')
                    goto cerror;
            case '\\': 
                if ((c = *sp++) == '\0')
                    goto cerror;

+               /* FALLTHRU */

        defchar: 
            default: 
                *ep++ = CCHR;
        defchar: 
            default: 
                *ep++ = CCHR;

diff --git a/uip/popsbr.c b/uip/popsbr.c
index 16eba46d1dd70b89de866454e5873ef9c1412ac6..ebb9b18f538f71a793366707867f71df8b009c9c 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -272,7 +272,7 @@ pop_init (char *host, char *port, char *user, char *proxy, int snoop,
            strncpy (buffer, response, sizeof(buffer));
            command ("QUIT");
            strncpy (response, buffer, sizeof(response));
            strncpy (buffer, response, sizeof(buffer));
            command ("QUIT");
            strncpy (response, buffer, sizeof(response));

-                               /* and fall */
+           /* FALLTHRU */

 
        case NOTOK: 
        case DONE: 
 
        case NOTOK: 
        case DONE: 

diff --git a/uip/post.c b/uip/post.c
index 385aae20f5d703ce717b86e3ccf1d978c6ddec6a..9973beb793fa5dadba6322d9a804d9e7f28eb385 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -1867,6 +1867,7 @@ do_text (char *file, int fd)
        case RP_NO: 
        case RP_NDEL: 
            die (NULL, "posting failed; %s", rp_string (retval));
        case RP_NO: 
        case RP_NDEL: 
            die (NULL, "posting failed; %s", rp_string (retval));

+           /* FALLTHRU */

 
        default: 
            die (NULL, "unexpected response; %s", rp_string (retval));
 
        default: 
            die (NULL, "unexpected response; %s", rp_string (retval));

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index a8231e911167c424b6aa4b07f490b45addd5372e..7a96658edd5e3c1d2063ae082173adb6c0e1c949 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -129,7 +129,8 @@ main (int argc, char **argv)
        sleep (5);
     switch (child_id) {
        case NOTOK: 
        sleep (5);
     switch (child_id) {
        case NOTOK: 

-           admonish (NULL, "unable to fork");/* fall */
+           admonish (NULL, "unable to fork");
+           /* FALLTHRU */

        case OK: 
            execvp (program, vec);
            fprintf (stderr, "unable to exec ");
        case OK: 
            execvp (program, vec);
            fprintf (stderr, "unable to exec ");

diff --git a/uip/repl.c b/uip/repl.c
index 7f0c7bac8dba4db647f6fb8961e76e0cafa957b7..15aa0a3a58e81d1bef131f9cc39850c26c42526a 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -225,7 +225,8 @@ main (int argc, char **argv)
                    nwhat = 0;
                    continue;
                case BILDSW: 
                    nwhat = 0;
                    continue;
                case BILDSW: 

-                   buildsw++;  /* fall... */
+                   buildsw++;
+                   /* FALLTHRU */

                case NWHATSW: 
                    nwhat++;
                    continue;
                case NWHATSW: 
                    nwhat++;
                    continue;

diff --git a/uip/rmf.c b/uip/rmf.c
index 30f94219ab7fba2a6144ebec7fdc8bb5f3976428..6a86fe6a9918bafb2b72906fcecf9f0d6fa0ee28 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -133,7 +133,8 @@ rmf (char *folder)
     switch (i = chdir (maildir = m_maildir (folder))) {
        case OK: 
            if (access (".", W_OK) != NOTOK && access ("..", W_OK) != NOTOK)
     switch (i = chdir (maildir = m_maildir (folder))) {
        case OK: 
            if (access (".", W_OK) != NOTOK && access ("..", W_OK) != NOTOK)

-               break;          /* fall otherwise */
+               break;
+           /* FALLTHRU */

 
        case NOTOK: 
            snprintf (cur, sizeof(cur), "atr-%s-%s",
 
        case NOTOK: 
            snprintf (cur, sizeof(cur), "atr-%s-%s",


@@ -162,7 +163,8 @@ rmf (char *folder)
            case '.': 
                if (strcmp (dp->d_name, ".") == 0
                        || strcmp (dp->d_name, "..") == 0)
            case '.': 
                if (strcmp (dp->d_name, ".") == 0
                        || strcmp (dp->d_name, "..") == 0)

-                   continue;   /* else fall */
+                   continue;
+               /* FALLTHRU */

 
            case ',': 
                break;
 
            case ',': 
                break;

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 191e69e8490286cda51ceff2dbcd70c11551fc80..87bcb591199a5e87bccac15f4e7885d0338e9dc9 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -273,7 +273,7 @@ body:;
                    state = BODY;
                    goto body;
                }
                    state = BODY;
                    goto body;
                }

-               /* fall through */
+               /* FALLTHRU */

 
            case FILEEOF:
                goto finished;
 
            case FILEEOF:
                goto finished;

diff --git a/uip/send.c b/uip/send.c
index 2d162a7a829f7d8a5fd6f59d735801375f11acdc..da7532a7160f64193c6bf7754335953b5346e520 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -243,7 +243,8 @@ main (int argc, char **argv)
                    continue;
 
                case DEBUGSW: 
                    continue;
 
                case DEBUGSW: 

-                   debugsw++;  /* fall */
+                   debugsw++;
+                   /* FALLTHRU */

                case NFILTSW: 
                case FRMTSW: 
                case NFRMTSW: 
                case NFILTSW: 
                case FRMTSW: 
                case NFRMTSW: 


@@ -283,7 +284,7 @@ main (int argc, char **argv)
                case SASLMECHSW:
                    if (!(saslmech = *argp) || *saslmech == '-')
                        adios (NULL, "missing argument to %s", argp[-1]);
                case SASLMECHSW:
                    if (!(saslmech = *argp) || *saslmech == '-')
                        adios (NULL, "missing argument to %s", argp[-1]);

-                   /* Fall through */
+                   /* FALLTHRU */

 
                case ALIASW: 
                case FILTSW: 
 
                case ALIASW: 
                case FILTSW: 


@@ -483,8 +484,10 @@ go_to_it:
         switch (sendsbr (vec, vecp, program, msgs[msgnum], &st, 1, auth_svc)) {
            case DONE: 
                done (++status);
         switch (sendsbr (vec, vecp, program, msgs[msgnum], &st, 1, auth_svc)) {
            case DONE: 
                done (++status);

+               /* FALLTHRU */

            case NOTOK: 
            case NOTOK: 

-               status++;       /* fall */
+               status++;
+               /* FALLTHRU */

            case OK:
                break;
        }
            case OK:
                break;
        }

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 33dd3451ee5c4c74350e8d40cf8a4e99e9af115b..6409aeca1ef1eb3b24872d9daa40edcaa727fb52 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -522,6 +522,7 @@ alert (char *file, int out)
        case NOTOK:
            /* oops -- fork error */
            advise ("fork", "unable to");
        case NOTOK:
            /* oops -- fork error */
            advise ("fork", "unable to");

+           /* FALLTHRU */

 
        case OK:
            /* child process -- send it */
 
        case OK:
            /* child process -- send it */


@@ -621,6 +622,7 @@ anno (int fd, struct stat *st)
                            "unable to fork, so doing annotations by hand...");
            if (cwd == NULL)
                cwd = mh_xstrdup(pwd ());
                            "unable to fork, so doing annotations by hand...");
            if (cwd == NULL)
                cwd = mh_xstrdup(pwd ());

+           /* FALLTHRU */

 
        case OK:
            /* block a few signals */
 
        case OK:
            /* block a few signals */

diff --git a/uip/show.c b/uip/show.c
index 9aa84b3981d26b93db957907029ffe4933b627be..7fb4cfaea2840673e64ed9715cca275c352c0611 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -96,6 +96,7 @@ main (int argc, char **argv)
                    goto non_mhl_switches;
                case NHEADSW:
                    headersw = 0;
                    goto non_mhl_switches;
                case NHEADSW:
                    headersw = 0;

+                   /* FALLTHRU */

                case CONCATSW:
                case NCONCATSW:
 non_mhl_switches:
                case CONCATSW:
                case NCONCATSW:
 non_mhl_switches:


@@ -413,7 +414,7 @@ invalid:
                            continue;
                        case '(':
                            i++;
                            continue;
                        case '(':
                            i++;

-                           /* and fall... */
+                           /* FALLTHRU */

                        default:
                            continue;
                        case ')':
                        default:
                            continue;
                        case ')':

diff --git a/uip/slocal.c b/uip/slocal.c
index 0e3baae4b069b37546b8270c076f70fe9131bddc..f41b6ad3c140a14af7c3dd8caa7b418e79604508 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -484,7 +484,8 @@ usr_delivery (int fd, char *delivery, int su)
                 * do this - else fall through
                 */
                if (!next)
                 * do this - else fall through
                 */
                if (!next)

-                   continue;   /* else fall */
+                   continue;
+               /* FALLTHRU */

 
            case '?': 
                /*
 
            case '?': 
                /*


@@ -492,7 +493,8 @@ usr_delivery (int fd, char *delivery, int su)
                 * consider delivered if action is successful.
                 */
                if (won)
                 * consider delivered if action is successful.
                 */
                if (won)

-                   continue;   /* else fall */
+                   continue;
+               /* FALLTHRU */

 
            case 'A': 
            case 'a': 
 
            case 'A': 
            case 'a': 


@@ -538,7 +540,8 @@ usr_delivery (int fd, char *delivery, int su)
                    if (won)
                        continue;
                    break;
                    if (won)
                        continue;
                    break;

-               }               /* else fall */
+               }
+               /* FALLTHRU */

 
            default: 
                /* parse message and build lookup table */
 
            default: 
                /* parse message and build lookup table */


@@ -565,7 +568,8 @@ usr_delivery (int fd, char *delivery, int su)
            case 'q':
                /* deliver to quoted pipe */
                if (strcasecmp (action, "qpipe"))
            case 'q':
                /* deliver to quoted pipe */
                if (strcasecmp (action, "qpipe"))

-                   continue;   /* else fall */
+                   continue;
+               /* FALLTHRU */

            case '^':
                expand (tmpbuf, string, fd);
                if (split (tmpbuf, vec) < 1)
            case '^':
                expand (tmpbuf, string, fd);
                if (split (tmpbuf, vec) < 1)


@@ -576,7 +580,8 @@ usr_delivery (int fd, char *delivery, int su)
            case 'p': 
                /* deliver to pipe */
                if (strcasecmp (action, "pipe"))
            case 'p': 
                /* deliver to pipe */
                if (strcasecmp (action, "pipe"))

-                   continue;   /* else fall */
+                   continue;
+               /* FALLTHRU */

            case '|': 
                vec[2] = "sh";
                vec[3] = "-c";
            case '|': 
                vec[2] = "sh";
                vec[3] = "-c";


@@ -594,7 +599,8 @@ usr_delivery (int fd, char *delivery, int su)
                }
                /* deliver to nmh folder */
                else if (strcasecmp (action, "folder"))
                }
                /* deliver to nmh folder */
                else if (strcasecmp (action, "folder"))

-                   continue;   /* else fall */
+                   continue;
+               /* FALLTHRU */

            case '+':
                status = usr_folder (fd, string);
                break;
            case '+':
                status = usr_folder (fd, string);
                break;


@@ -607,7 +613,8 @@ usr_delivery (int fd, char *delivery, int su)
                }
                /* mbox format */
                else if (strcasecmp (action, "mbox"))
                }
                /* mbox format */
                else if (strcasecmp (action, "mbox"))

-                   continue;   /* else fall */
+                   continue;
+               /* FALLTHRU */

 
            case '>': 
                /* mbox format */
 
            case '>': 
                /* mbox format */

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 919dd901b291d43fbd6c13ba44b0813963994988..61cf45d6aa500a030f377565314fdccf6948067b 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -834,6 +834,7 @@ sendfile (char **arg, char *file, int pushsw)
     switch (child_id) {
        case NOTOK:
            advise (NULL, "unable to fork, so sending directly...");
     switch (child_id) {
        case NOTOK:
            advise (NULL, "unable to fork, so sending directly...");

+           /* FALLTHRU */

        case OK:
            vec = argsplit(sendproc, &program, &vecp);
            if (pushsw)
        case OK:
            vec = argsplit(sendproc, &program, &vecp);
            if (pushsw)


@@ -1119,7 +1120,8 @@ sendit (char *sp, char **arg, char *file, int pushed)
                    continue;
 
                case DEBUGSW:
                    continue;
 
                case DEBUGSW:

-                   debugsw++;  /* fall */
+                   debugsw++;
+                   /* FALLTHRU */

                case NFILTSW:
                case FRMTSW:
                case NFRMTSW:
                case NFILTSW:
                case FRMTSW:
                case NFRMTSW:


@@ -1159,7 +1161,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
 
                case SASLMECHSW:
                     saslmech = *argp;
 
                case SASLMECHSW:
                     saslmech = *argp;

-                   /* fall thru */
+                   /* FALLTHRU */

                case ALIASW:
                case FILTSW:
                case WIDTHSW:
                case ALIASW:
                case FILTSW:
                case WIDTHSW:


@@ -1185,6 +1187,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
                        advise (NULL, "missing argument to %s", argp[-2]);
                        return;
                    }
                        advise (NULL, "missing argument to %s", argp[-2]);
                        return;
                    }

+                   /* FALLTHRU */

                case SNDRFSW:
                    continue;
 
                case SNDRFSW:
                    continue;
 

diff --git a/uip/whom.c b/uip/whom.c
index 411c4770e13dde7f6a49ca99be42adb16c98f2e4..4a3f81dca97f23da7cbc8ec0fc44b84fb79793f1 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -182,7 +182,8 @@ main (int argc, char **argv)
 
     switch (distsw ? child_id : OK) {
        case NOTOK:
 
     switch (distsw ? child_id : OK) {
        case NOTOK:

-           advise (NULL, "unable to fork, so checking directly...");
+           advise (NULL, "unable to fork, so checking directly...");
+           /* FALLTHRU */

        case OK:
            execvp (postproc, vec);
            fprintf (stderr, "unable to exec ");
        case OK:
            execvp (postproc, vec);
            fprintf (stderr, "unable to exec ");