Replace some "FALLTHRU" comments with control flow.

Instead of a case statement falling through, with a "FALLTHRU" comment,
to the follow case that just does a break, continue, goto, etc.,
control-flow statement, duplicate the statement in place of the comment.
Fall-through should be the exception, and saving a break statement
doesn't offset the cognitive cost when reading the source.

diff --git a/sbr/mf.c b/sbr/mf.c
index b6c7291..cf5b6d8 100644 (file)
--- a/sbr/mf.c
+++ b/sbr/mf.c
@@ -367,7 +367,7 @@ again: ;
                        strcpy (err, "extraneous semi-colon");
                        return NOTOK;
                    }
                        strcpy (err, "extraneous semi-colon");
                        return NOTOK;
                    }

-                   /* FALLTHRU */
+                   return OK;

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

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index 500ea0b..c9cc924 100644 (file)
--- a/sbr/seq_read.c
+++ b/sbr/seq_read.c
@@ -103,7 +103,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);

-               /* FALLTHRU */
+               break;

 
            case FILEEOF:
                break;
 
            case FILEEOF:
                break;

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index 3e45678..489b707 100644 (file)
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -194,7 +194,7 @@ alias (char *file)
                    fclose (fp);
                    return i;
                }
                    fclose (fp);
                    return i;
                }

-               /* FALLTHRU */
+               continue;

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

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

-           /* FALLTHRU */
+           goto finished;

 
        default:
            goto finished;
 
        default:
            goto finished;

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

-               /* FALLTHRU */
+               break;

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


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

-               /* FALLTHRU */
+               break;

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

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 8bd7be2..501bb88 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -331,7 +331,7 @@ finish_field:
 
        case BODY:
            fseek (in, (long) (-strlen (buf)), SEEK_CUR);
 
        case BODY:
            fseek (in, (long) (-strlen (buf)), SEEK_CUR);

-           /* FALLTHRU */
+           break;

        case FILEEOF:
            break;
 
        case FILEEOF:
            break;
 

diff --git a/uip/new.c b/uip/new.c
index 49aba33..c82979e 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);

-               /* FALLTHRU */
+                break;

 
             case FILEEOF:
                 break;
 
             case FILEEOF:
                 break;

diff --git a/uip/post.c b/uip/post.c
index 681556b..9723d26 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -1866,7 +1866,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 */
+           break;

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

diff --git a/uip/rmf.c b/uip/rmf.c
index ec2f8fa..cede3b0 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -164,7 +164,7 @@ rmf (char *folder)
                if (strcmp (dp->d_name, ".") == 0
                        || strcmp (dp->d_name, "..") == 0)
                    continue;
                if (strcmp (dp->d_name, ".") == 0
                        || strcmp (dp->d_name, "..") == 0)
                    continue;

-               /* FALLTHRU */
+               break;

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

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 7d81b51..569991e 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -260,7 +260,7 @@ body:;
                    state = BODY;
                    goto body;
                }
                    state = BODY;
                    goto body;
                }

-               /* FALLTHRU */
+               goto finished;

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

diff --git a/uip/show.c b/uip/show.c
index 9430e00..ac01292 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -414,7 +414,7 @@ invalid:
                            continue;
                        case '(':
                            i++;
                            continue;
                        case '(':
                            i++;

-                           /* FALLTHRU */
+                           continue;

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

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 164a552..802535b 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -1174,7 +1174,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
                        inform("missing argument to %s", argp[-2]);
                        return;
                    }
                        inform("missing argument to %s", argp[-2]);
                        return;
                    }

-                   /* FALLTHRU */
+                   continue;

                case SNDRFSW:
                    continue;
            }
                case SNDRFSW:
                    continue;
            }