To make the code more readable, delete 283 /* FALLTHROUGH */ comments

that were right between two adjacent case statement.  Keep only
those 24 where the first case actually executes some code before
falling through to the next case.

diff --git a/usr.bin/mandoc/html.c b/usr.bin/mandoc/html.c
index b33d439..c03df78 100644 (file)
--- a/usr.bin/mandoc/html.c
+++ b/usr.bin/mandoc/html.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: html.c,v 1.58 2015/10/06 18:30:43 schwarze Exp $ */
+/*     $OpenBSD: html.c,v 1.59 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -216,7 +216,6 @@ print_metaf(struct html *h, enum mandoc_esc deco)
                font = HTMLFONT_BI;
                break;
        case ESCAPE_FONT:
-               /* FALLTHROUGH */
        case ESCAPE_FONTROMAN:
                font = HTMLFONT_NONE;
                break;
@@ -281,11 +280,8 @@ html_strlen(const char *cp)
                case ESCAPE_ERROR:
                        return sz;
                case ESCAPE_UNICODE:
-                       /* FALLTHROUGH */
                case ESCAPE_NUMBERED:
-                       /* FALLTHROUGH */
                case ESCAPE_SPECIAL:
-                       /* FALLTHROUGH */
                case ESCAPE_OVERSTRIKE:
                        if (skip)
                                skip = 0;
@@ -324,7 +320,7 @@ print_escape(char c)
                break;
        case ASCII_HYPH:
                putchar('-');
-               /* FALLTHROUGH */
+               break;
        case ASCII_BREAK:
                break;
        default:
@@ -369,15 +365,10 @@ print_encode(struct html *h, const char *p, int norecurse)
 
                switch (esc) {
                case ESCAPE_FONT:
-                       /* FALLTHROUGH */
                case ESCAPE_FONTPREV:
-                       /* FALLTHROUGH */
                case ESCAPE_FONTBOLD:
-                       /* FALLTHROUGH */
                case ESCAPE_FONTITALIC:
-                       /* FALLTHROUGH */
                case ESCAPE_FONTBI:
-                       /* FALLTHROUGH */
                case ESCAPE_FONTROMAN:
                        if (0 == norecurse)
                                print_metaf(h, esc);

diff --git a/usr.bin/mandoc/main.c b/usr.bin/mandoc/main.c
index 41fb885..07aa682 100644 (file)
--- a/usr.bin/mandoc/main.c
+++ b/usr.bin/mandoc/main.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: main.c,v 1.152 2015/10/11 21:06:59 schwarze Exp $ */
+/*     $OpenBSD: main.c,v 1.153 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -675,13 +675,9 @@ parse(struct curparse *curp, int fd, const char *file)
                        curp->outman = man_man;
                        break;
                case OUTT_PDF:
-                       /* FALLTHROUGH */
                case OUTT_ASCII:
-                       /* FALLTHROUGH */
                case OUTT_UTF8:
-                       /* FALLTHROUGH */
                case OUTT_LOCALE:
-                       /* FALLTHROUGH */
                case OUTT_PS:
                        curp->outman = terminal_man;
                        curp->outmdoc = terminal_mdoc;
@@ -862,7 +858,6 @@ woptions(struct curparse *curp, char *arg)
                        curp->wstop = 1;
                        break;
                case 1:
-                       /* FALLTHROUGH */
                case 2:
                        curp->wlevel = MANDOCLEVEL_WARNING;
                        break;

diff --git a/usr.bin/mandoc/man_term.c b/usr.bin/mandoc/man_term.c
index d51182c..3a08cc6 100644 (file)
--- a/usr.bin/mandoc/man_term.c
+++ b/usr.bin/mandoc/man_term.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: man_term.c,v 1.138 2015/10/06 18:30:43 schwarze Exp $ */
+/*     $OpenBSD: man_term.c,v 1.139 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -369,14 +369,11 @@ pre_ft(DECL_ARGS)
        cp = n->child->string;
        switch (*cp) {
        case '4':
-               /* FALLTHROUGH */
        case '3':
-               /* FALLTHROUGH */
        case 'B':
                term_fontrepl(p, TERMFONT_BOLD);
                break;
        case '2':
-               /* FALLTHROUGH */
        case 'I':
                term_fontrepl(p, TERMFONT_UNDER);
                break;
@@ -384,9 +381,7 @@ pre_ft(DECL_ARGS)
                term_fontlast(p);
                break;
        case '1':
-               /* FALLTHROUGH */
        case 'C':
-               /* FALLTHROUGH */
        case 'R':
                term_fontrepl(p, TERMFONT_NONE);
                break;
@@ -447,15 +442,10 @@ pre_sp(DECL_ARGS)
        if ((NULL == n->prev && n->parent)) {
                switch (n->parent->tok) {
                case MAN_SH:
-                       /* FALLTHROUGH */
                case MAN_SS:
-                       /* FALLTHROUGH */
                case MAN_PP:
-                       /* FALLTHROUGH */
                case MAN_LP:
-                       /* FALLTHROUGH */
                case MAN_P:
-                       /* FALLTHROUGH */
                        return 0;
                default:
                        break;

diff --git a/usr.bin/mandoc/man_validate.c b/usr.bin/mandoc/man_validate.c
index 6d5d7be..07dde73 100644 (file)
--- a/usr.bin/mandoc/man_validate.c
+++ b/usr.bin/mandoc/man_validate.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: man_validate.c,v 1.90 2015/04/19 13:59:37 schwarze Exp $ */
+/*     $OpenBSD: man_validate.c,v 1.91 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -115,7 +115,6 @@ man_valid_post(struct roff_man *man)
                check_root(man, n);
                break;
        case ROFFT_EQN:
-               /* FALLTHROUGH */
        case ROFFT_TBL:
                break;
        default:
@@ -205,17 +204,11 @@ post_ft(CHKARGS)
        cp = n->child->string;
        switch (*cp) {
        case '1':
-               /* FALLTHROUGH */
        case '2':
-               /* FALLTHROUGH */
        case '3':
-               /* FALLTHROUGH */
        case '4':
-               /* FALLTHROUGH */
        case 'I':
-               /* FALLTHROUGH */
        case 'P':
-               /* FALLTHROUGH */
        case 'R':
                if ('\0' == cp[1])
                        ok = 1;
@@ -497,7 +490,6 @@ post_vs(CHKARGS)
 
        switch (n->parent->tok) {
        case MAN_SH:
-               /* FALLTHROUGH */
        case MAN_SS:
                mandoc_vmsg(MANDOCERR_PAR_SKIP, man->parse, n->line, n->pos,
                    "%s after %s", man_macronames[n->tok],

diff --git a/usr.bin/mandoc/mandoc.c b/usr.bin/mandoc/mandoc.c
index 4c1d763..2184c17 100644 (file)
--- a/usr.bin/mandoc/mandoc.c
+++ b/usr.bin/mandoc/mandoc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mandoc.c,v 1.62 2015/10/06 18:30:43 schwarze Exp $ */
+/*     $OpenBSD: mandoc.c,v 1.63 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -91,11 +91,8 @@ mandoc_escape(const char **end, const char **start, int *sz)
         * Escapes taking no arguments at all.
         */
        case 'd':
-               /* FALLTHROUGH */
        case 'u':
-               /* FALLTHROUGH */
        case ',':
-               /* FALLTHROUGH */
        case '/':
                return ESCAPE_IGNORE;
 
@@ -113,19 +110,12 @@ mandoc_escape(const char **end, const char **start, int *sz)
         * 'X' is the trigger.  These have opaque sub-strings.
         */
        case 'F':
-               /* FALLTHROUGH */
        case 'g':
-               /* FALLTHROUGH */
        case 'k':
-               /* FALLTHROUGH */
        case 'M':
-               /* FALLTHROUGH */
        case 'm':
-               /* FALLTHROUGH */
        case 'n':
-               /* FALLTHROUGH */
        case 'V':
-               /* FALLTHROUGH */
        case 'Y':
                gly = ESCAPE_IGNORE;
                /* FALLTHROUGH */
@@ -153,15 +143,10 @@ mandoc_escape(const char **end, const char **start, int *sz)
         * The \B and \w escapes are handled in roff.c, roff_res().
         */
        case 'A':
-               /* FALLTHROUGH */
        case 'b':
-               /* FALLTHROUGH */
        case 'D':
-               /* FALLTHROUGH */
        case 'R':
-               /* FALLTHROUGH */
        case 'X':
-               /* FALLTHROUGH */
        case 'Z':
                gly = ESCAPE_IGNORE;
                /* FALLTHROUGH */
@@ -179,17 +164,11 @@ mandoc_escape(const char **end, const char **start, int *sz)
         * and 'N' resolves to a numerical expression.
         */
        case 'h':
-               /* FALLTHROUGH */
        case 'H':
-               /* FALLTHROUGH */
        case 'L':
-               /* FALLTHROUGH */
        case 'l':
-               /* FALLTHROUGH */
        case 'S':
-               /* FALLTHROUGH */
        case 'v':
-               /* FALLTHROUGH */
        case 'x':
                if (strchr(" %&()*+-./0123456789:<=>", **start)) {
                        if ('\0' != **start)
@@ -245,9 +224,7 @@ mandoc_escape(const char **end, const char **start, int *sz)
                        term = '\'';
                        break;
                case '3':
-                       /* FALLTHROUGH */
                case '2':
-                       /* FALLTHROUGH */
                case '1':
                        *sz = (*end)[-1] == 's' &&
                            isdigit((unsigned char)(*end)[1]) ? 2 : 1;
@@ -323,12 +300,10 @@ mandoc_escape(const char **end, const char **start, int *sz)
 
                switch (**start) {
                case '3':
-                       /* FALLTHROUGH */
                case 'B':
                        gly = ESCAPE_FONTBOLD;
                        break;
                case '2':
-                       /* FALLTHROUGH */
                case 'I':
                        gly = ESCAPE_FONTITALIC;
                        break;
@@ -336,7 +311,6 @@ mandoc_escape(const char **end, const char **start, int *sz)
                        gly = ESCAPE_FONTPREV;
                        break;
                case '1':
-                       /* FALLTHROUGH */
                case 'R':
                        gly = ESCAPE_FONTROMAN;
                        break;
@@ -558,19 +532,14 @@ mandoc_eos(const char *p, size_t sz)
        for (q = p + (int)sz - 1; q >= p; q--) {
                switch (*q) {
                case '\"':
-                       /* FALLTHROUGH */
                case '\'':
-                       /* FALLTHROUGH */
                case ']':
-                       /* FALLTHROUGH */
                case ')':
                        if (0 == found)
                                enclosed = 1;
                        break;
                case '.':
-                       /* FALLTHROUGH */
                case '!':
-                       /* FALLTHROUGH */
                case '?':
                        found = 1;
                        break;

diff --git a/usr.bin/mandoc/mandocdb.c b/usr.bin/mandoc/mandocdb.c
index 1a5f838..7f8c67b 100644 (file)
--- a/usr.bin/mandoc/mandocdb.c
+++ b/usr.bin/mandoc/mandocdb.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mandocdb.c,v 1.151 2015/10/11 21:06:59 schwarze Exp $ */
+/*     $OpenBSD: mandocdb.c,v 1.152 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -679,7 +679,6 @@ treescan(void)
                        continue;
 
                case FTS_D:
-                       /* FALLTHROUGH */
                case FTS_DP:
                        break;
 
@@ -1545,13 +1544,9 @@ parse_mdoc(struct mpage *mpage, const struct roff_meta *meta,
        for (n = n->child; NULL != n; n = n->next) {
                switch (n->type) {
                case ROFFT_ELEM:
-                       /* FALLTHROUGH */
                case ROFFT_BLOCK:
-                       /* FALLTHROUGH */
                case ROFFT_HEAD:
-                       /* FALLTHROUGH */
                case ROFFT_BODY:
-                       /* FALLTHROUGH */
                case ROFFT_TAIL:
                        if (NULL != mdocs[n->tok].fp)
                               if (0 == (*mdocs[n->tok].fp)(mpage, meta, n))
@@ -1904,7 +1899,6 @@ render_string(char **public, size_t *psz)
                case '\\':
                        break;
                case '\t':
-                       /* FALLTHROUGH */
                case ASCII_NBRSP:
                        dst[dsz++] = ' ';
                        scp++;

diff --git a/usr.bin/mandoc/mdoc.c b/usr.bin/mandoc/mdoc.c
index 34683e5..90255f0 100644 (file)
--- a/usr.bin/mandoc/mdoc.c
+++ b/usr.bin/mandoc/mdoc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mdoc.c,v 1.142 2015/10/06 18:30:44 schwarze Exp $ */
+/*     $OpenBSD: mdoc.c,v 1.143 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -180,13 +180,9 @@ mdoc_block_alloc(struct roff_man *mdoc, int line, int pos,
 
        switch (tok) {
        case MDOC_Bd:
-               /* FALLTHROUGH */
        case MDOC_Bf:
-               /* FALLTHROUGH */
        case MDOC_Bl:
-               /* FALLTHROUGH */
        case MDOC_En:
-               /* FALLTHROUGH */
        case MDOC_Rs:
                p->norm = mandoc_calloc(1, sizeof(union mdoc_data));
                break;
@@ -470,25 +466,17 @@ mdoc_isdelim(const char *p)
        if ('\0' == p[1])
                switch (p[0]) {
                case '(':
-                       /* FALLTHROUGH */
                case '[':
                        return DELIM_OPEN;
                case '|':
                        return DELIM_MIDDLE;
                case '.':
-                       /* FALLTHROUGH */
                case ',':
-                       /* FALLTHROUGH */
                case ';':
-                       /* FALLTHROUGH */
                case ':':
-                       /* FALLTHROUGH */
                case '?':
-                       /* FALLTHROUGH */
                case '!':
-                       /* FALLTHROUGH */
                case ')':
-                       /* FALLTHROUGH */
                case ']':
                        return DELIM_CLOSE;
                default:

diff --git a/usr.bin/mandoc/mdoc_html.c b/usr.bin/mandoc/mdoc_html.c
index ecdd93b..b5eba07 100644 (file)
--- a/usr.bin/mandoc/mdoc_html.c
+++ b/usr.bin/mandoc/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mdoc_html.c,v 1.112 2015/10/06 18:30:44 schwarze Exp $ */
+/*     $OpenBSD: mdoc_html.c,v 1.113 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -297,13 +297,9 @@ synopsis_pre(struct html *h, const struct roff_node *n)
 
        switch (n->prev->tok) {
        case MDOC_Fd:
-               /* FALLTHROUGH */
        case MDOC_Fn:
-               /* FALLTHROUGH */
        case MDOC_Fo:
-               /* FALLTHROUGH */
        case MDOC_In:
-               /* FALLTHROUGH */
        case MDOC_Vt:
                print_paragraph(h);
                break;
@@ -824,23 +820,15 @@ mdoc_it_pre(MDOC_ARGS)
        if (n->type == ROFFT_HEAD) {
                switch (type) {
                case LIST_bullet:
-                       /* FALLTHROUGH */
                case LIST_dash:
-                       /* FALLTHROUGH */
                case LIST_item:
-                       /* FALLTHROUGH */
                case LIST_hyphen:
-                       /* FALLTHROUGH */
                case LIST_enum:
                        return 0;
                case LIST_diag:
-                       /* FALLTHROUGH */
                case LIST_hang:
-                       /* FALLTHROUGH */
                case LIST_inset:
-                       /* FALLTHROUGH */
                case LIST_ohang:
-                       /* FALLTHROUGH */
                case LIST_tag:
                        SCALE_VS_INIT(&su, ! bl->norm->Bl.comp);
                        bufcat_su(h, "margin-top", &su);
@@ -859,13 +847,9 @@ mdoc_it_pre(MDOC_ARGS)
        } else if (n->type == ROFFT_BODY) {
                switch (type) {
                case LIST_bullet:
-                       /* FALLTHROUGH */
                case LIST_hyphen:
-                       /* FALLTHROUGH */
                case LIST_dash:
-                       /* FALLTHROUGH */
                case LIST_enum:
-                       /* FALLTHROUGH */
                case LIST_item:
                        SCALE_VS_INIT(&su, ! bl->norm->Bl.comp);
                        bufcat_su(h, "margin-top", &su);
@@ -873,13 +857,9 @@ mdoc_it_pre(MDOC_ARGS)
                        print_otag(h, TAG_LI, 2, tag);
                        break;
                case LIST_diag:
-                       /* FALLTHROUGH */
                case LIST_hang:
-                       /* FALLTHROUGH */
                case LIST_inset:
-                       /* FALLTHROUGH */
                case LIST_ohang:
-                       /* FALLTHROUGH */
                case LIST_tag:
                        if (NULL == bl->norm->Bl.width) {
                                print_otag(h, TAG_DD, 1, tag);
@@ -971,11 +951,8 @@ mdoc_bl_pre(MDOC_ARGS)
 
        switch (n->norm->Bl.type) {
        case LIST_bullet:
-               /* FALLTHROUGH */
        case LIST_dash:
-               /* FALLTHROUGH */
        case LIST_hyphen:
-               /* FALLTHROUGH */
        case LIST_item:
                print_otag(h, TAG_UL, 2, tag);
                break;
@@ -983,13 +960,9 @@ mdoc_bl_pre(MDOC_ARGS)
                print_otag(h, TAG_OL, 2, tag);
                break;
        case LIST_diag:
-               /* FALLTHROUGH */
        case LIST_hang:
-               /* FALLTHROUGH */
        case LIST_inset:
-               /* FALLTHROUGH */
        case LIST_ohang:
-               /* FALLTHROUGH */
        case LIST_tag:
                print_otag(h, TAG_DL, 2, tag);
                break;
@@ -1171,19 +1144,12 @@ mdoc_bd_pre(MDOC_ARGS)
                 */
                switch (nn->tok) {
                case MDOC_Sm:
-                       /* FALLTHROUGH */
                case MDOC_br:
-                       /* FALLTHROUGH */
                case MDOC_sp:
-                       /* FALLTHROUGH */
                case MDOC_Bl:
-                       /* FALLTHROUGH */
                case MDOC_D1:
-                       /* FALLTHROUGH */
                case MDOC_Dl:
-                       /* FALLTHROUGH */
                case MDOC_Lp:
-                       /* FALLTHROUGH */
                case MDOC_Pp:
                        continue;
                default:
@@ -2063,23 +2029,19 @@ mdoc_quote_pre(MDOC_ARGS)
 
        switch (n->tok) {
        case MDOC_Ao:
-               /* FALLTHROUGH */
        case MDOC_Aq:
                print_text(h, n->nchild == 1 &&
                    n->child->tok == MDOC_Mt ?  "<" : "\\(la");
                break;
        case MDOC_Bro:
-               /* FALLTHROUGH */
        case MDOC_Brq:
                print_text(h, "\\(lC");
                break;
        case MDOC_Bo:
-               /* FALLTHROUGH */
        case MDOC_Bq:
                print_text(h, "\\(lB");
                break;
        case MDOC_Oo:
-               /* FALLTHROUGH */
        case MDOC_Op:
                print_text(h, "\\(lB");
                h->flags |= HTML_NOSPACE;
@@ -2093,16 +2055,12 @@ mdoc_quote_pre(MDOC_ARGS)
                print_text(h, n->norm->Es->child->string);
                break;
        case MDOC_Do:
-               /* FALLTHROUGH */
        case MDOC_Dq:
-               /* FALLTHROUGH */
        case MDOC_Qo:
-               /* FALLTHROUGH */
        case MDOC_Qq:
                print_text(h, "\\(lq");
                break;
        case MDOC_Po:
-               /* FALLTHROUGH */
        case MDOC_Pq:
                print_text(h, "(");
                break;
@@ -2113,7 +2071,6 @@ mdoc_quote_pre(MDOC_ARGS)
                print_otag(h, TAG_CODE, 1, &tag);
                break;
        case MDOC_So:
-               /* FALLTHROUGH */
        case MDOC_Sq:
                print_text(h, "\\(oq");
                break;
@@ -2136,22 +2093,17 @@ mdoc_quote_post(MDOC_ARGS)
 
        switch (n->tok) {
        case MDOC_Ao:
-               /* FALLTHROUGH */
        case MDOC_Aq:
                print_text(h, n->nchild == 1 &&
                    n->child->tok == MDOC_Mt ?  ">" : "\\(ra");
                break;
        case MDOC_Bro:
-               /* FALLTHROUGH */
        case MDOC_Brq:
                print_text(h, "\\(rC");
                break;
        case MDOC_Oo:
-               /* FALLTHROUGH */
        case MDOC_Op:
-               /* FALLTHROUGH */
        case MDOC_Bo:
-               /* FALLTHROUGH */
        case MDOC_Bq:
                print_text(h, "\\(rB");
                break;
@@ -2164,23 +2116,17 @@ mdoc_quote_post(MDOC_ARGS)
                        print_text(h, n->norm->Es->child->next->string);
                break;
        case MDOC_Qo:
-               /* FALLTHROUGH */
        case MDOC_Qq:
-               /* FALLTHROUGH */
        case MDOC_Do:
-               /* FALLTHROUGH */
        case MDOC_Dq:
                print_text(h, "\\(rq");
                break;
        case MDOC_Po:
-               /* FALLTHROUGH */
        case MDOC_Pq:
                print_text(h, ")");
                break;
        case MDOC_Ql:
-               /* FALLTHROUGH */
        case MDOC_So:
-               /* FALLTHROUGH */
        case MDOC_Sq:
                print_text(h, "\\(cq");
                break;

diff --git a/usr.bin/mandoc/mdoc_macro.c b/usr.bin/mandoc/mdoc_macro.c
index 1dd8a06..fe74b5e 100644 (file)
--- a/usr.bin/mandoc/mdoc_macro.c
+++ b/usr.bin/mandoc/mdoc_macro.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mdoc_macro.c,v 1.158 2015/10/06 18:30:44 schwarze Exp $ */
+/*     $OpenBSD: mdoc_macro.c,v 1.159 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -732,15 +732,10 @@ in_line(MACRO_PROT_ARGS)
 
        switch (tok) {
        case MDOC_An:
-               /* FALLTHROUGH */
        case MDOC_Ar:
-               /* FALLTHROUGH */
        case MDOC_Fl:
-               /* FALLTHROUGH */
        case MDOC_Mt:
-               /* FALLTHROUGH */
        case MDOC_Nm:
-               /* FALLTHROUGH */
        case MDOC_Pa:
                nc = 1;
                break;
@@ -944,7 +939,6 @@ blk_full(MACRO_PROT_ARGS)
                        if (mdoc_macros[n->tok].flags & MDOC_EXPLICIT) {
                                switch (tok) {
                                case MDOC_Sh:
-                                       /* FALLTHROUGH */
                                case MDOC_Ss:
                                        mandoc_vmsg(MANDOCERR_BLK_BROKEN,
                                            mdoc->parse, line, ppos,
@@ -1287,16 +1281,12 @@ in_line_argn(MACRO_PROT_ARGS)
 
        switch (tok) {
        case MDOC_Ap:
-               /* FALLTHROUGH */
        case MDOC_Ns:
-               /* FALLTHROUGH */
        case MDOC_Ux:
                maxargs = 0;
                break;
        case MDOC_Bx:
-               /* FALLTHROUGH */
        case MDOC_Es:
-               /* FALLTHROUGH */
        case MDOC_Xr:
                maxargs = 2;
                break;

diff --git a/usr.bin/mandoc/mdoc_man.c b/usr.bin/mandoc/mdoc_man.c
index f38c086..d173100 100644 (file)
--- a/usr.bin/mandoc/mdoc_man.c
+++ b/usr.bin/mandoc/mdoc_man.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mdoc_man.c,v 1.92 2015/10/06 18:30:44 schwarze Exp $ */
+/*     $OpenBSD: mdoc_man.c,v 1.93 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -816,13 +816,9 @@ pre_syn(const struct roff_node *n)
 
        switch (n->prev->tok) {
        case MDOC_Fd:
-               /* FALLTHROUGH */
        case MDOC_Fn:
-               /* FALLTHROUGH */
        case MDOC_Fo:
-               /* FALLTHROUGH */
        case MDOC_In:
-               /* FALLTHROUGH */
        case MDOC_Vt:
                outflags |= MMAN_sp;
                break;
@@ -1373,9 +1369,7 @@ pre_it(DECL_ARGS)
                case LIST_item:
                        return 0;
                case LIST_inset:
-                       /* FALLTHROUGH */
                case LIST_diag:
-                       /* FALLTHROUGH */
                case LIST_ohang:
                        if (bln->norm->Bl.type == LIST_diag)
                                print_line(".B \"", 0);
@@ -1384,9 +1378,7 @@ pre_it(DECL_ARGS)
                        outflags &= ~MMAN_spc;
                        return 1;
                case LIST_bullet:
-                       /* FALLTHROUGH */
                case LIST_dash:
-                       /* FALLTHROUGH */
                case LIST_hyphen:
                        print_width(&bln->norm->Bl, NULL);
                        TPremain = 0;
@@ -1476,15 +1468,10 @@ post_it(DECL_ARGS)
        case ROFFT_BODY:
                switch (bln->norm->Bl.type) {
                case LIST_bullet:
-                       /* FALLTHROUGH */
                case LIST_dash:
-                       /* FALLTHROUGH */
                case LIST_hyphen:
-                       /* FALLTHROUGH */
                case LIST_enum:
-                       /* FALLTHROUGH */
                case LIST_hang:
-                       /* FALLTHROUGH */
                case LIST_tag:
                        assert(Bl_stack_len);
                        Bl_stack[--Bl_stack_len] = 0;
@@ -1598,7 +1585,6 @@ post_nm(DECL_ARGS)
                outflags &= ~MMAN_Bk;
                break;
        case ROFFT_HEAD:
-               /* FALLTHROUGH */
        case ROFFT_ELEM:
                if (n->child != NULL || meta->name != NULL)
                        font_pop();

diff --git a/usr.bin/mandoc/mdoc_term.c b/usr.bin/mandoc/mdoc_term.c
index 4f0cbd1..3dd4357 100644 (file)
--- a/usr.bin/mandoc/mdoc_term.c
+++ b/usr.bin/mandoc/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mdoc_term.c,v 1.227 2015/10/06 18:30:44 schwarze Exp $ */
+/*     $OpenBSD: mdoc_term.c,v 1.228 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -623,11 +623,8 @@ termp_it_pre(DECL_ARGS)
 
        switch (type) {
        case LIST_bullet:
-               /* FALLTHROUGH */
        case LIST_dash:
-               /* FALLTHROUGH */
        case LIST_hyphen:
-               /* FALLTHROUGH */
        case LIST_enum:
                width = term_len(p, 2);
                break;
@@ -635,7 +632,6 @@ termp_it_pre(DECL_ARGS)
                width = term_len(p, 8);
                break;
        case LIST_column:
-               /* FALLTHROUGH */
        case LIST_tag:
                width = term_len(p, 10);
                break;
@@ -760,16 +756,13 @@ termp_it_pre(DECL_ARGS)
 
        switch (type) {
        case LIST_enum:
+       case LIST_bullet:
+       case LIST_dash:
+       case LIST_hyphen:
                /*
                 * Weird special case.
                 * Some very narrow lists actually hang.
                 */
-               /* FALLTHROUGH */
-       case LIST_bullet:
-               /* FALLTHROUGH */
-       case LIST_dash:
-               /* FALLTHROUGH */
-       case LIST_hyphen:
                if (width <= (int)term_len(p, 2))
                        p->flags |= TERMP_HANG;
                if (n->type != ROFFT_HEAD)
@@ -852,13 +845,9 @@ termp_it_pre(DECL_ARGS)
                        break;
                /* FALLTHROUGH */
        case LIST_bullet:
-               /* FALLTHROUGH */
        case LIST_dash:
-               /* FALLTHROUGH */
        case LIST_enum:
-               /* FALLTHROUGH */
        case LIST_hyphen:
-               /* FALLTHROUGH */
        case LIST_tag:
                if (n->type == ROFFT_HEAD)
                        p->rmargin = p->offset + width;
@@ -894,7 +883,6 @@ termp_it_pre(DECL_ARGS)
                        term_fontpop(p);
                        break;
                case LIST_dash:
-                       /* FALLTHROUGH */
                case LIST_hyphen:
                        term_fontpush(p, TERMFONT_BOLD);
                        term_word(p, "\\(hy");
@@ -916,13 +904,9 @@ termp_it_pre(DECL_ARGS)
 
        switch (type) {
        case LIST_bullet:
-               /* FALLTHROUGH */
        case LIST_item:
-               /* FALLTHROUGH */
        case LIST_dash:
-               /* FALLTHROUGH */
        case LIST_hyphen:
-               /* FALLTHROUGH */
        case LIST_enum:
                if (n->type == ROFFT_HEAD)
                        return 0;
@@ -950,9 +934,7 @@ termp_it_post(DECL_ARGS)
 
        switch (type) {
        case LIST_item:
-               /* FALLTHROUGH */
        case LIST_diag:
-               /* FALLTHROUGH */
        case LIST_inset:
                if (n->type == ROFFT_BODY)
                        term_newln(p);
@@ -1291,13 +1273,9 @@ synopsis_pre(struct termp *p, const struct roff_node *n)
         */
        switch (n->prev->tok) {
        case MDOC_Fd:
-               /* FALLTHROUGH */
        case MDOC_Fn:
-               /* FALLTHROUGH */
        case MDOC_Fo:
-               /* FALLTHROUGH */
        case MDOC_In:
-               /* FALLTHROUGH */
        case MDOC_Vt:
                term_vspace(p);
                break;
@@ -1615,19 +1593,12 @@ termp_bd_pre(DECL_ARGS)
                 */
                switch (nn->tok) {
                case MDOC_Sm:
-                       /* FALLTHROUGH */
                case MDOC_br:
-                       /* FALLTHROUGH */
                case MDOC_sp:
-                       /* FALLTHROUGH */
                case MDOC_Bl:
-                       /* FALLTHROUGH */
                case MDOC_D1:
-                       /* FALLTHROUGH */
                case MDOC_Dl:
-                       /* FALLTHROUGH */
                case MDOC_Lp:
-                       /* FALLTHROUGH */
                case MDOC_Pp:
                        continue;
                default:
@@ -1864,27 +1835,21 @@ termp_quote_pre(DECL_ARGS)
 
        switch (n->tok) {
        case MDOC_Ao:
-               /* FALLTHROUGH */
        case MDOC_Aq:
                term_word(p, n->nchild == 1 &&
                    n->child->tok == MDOC_Mt ? "<" : "\\(la");
                break;
        case MDOC_Bro:
-               /* FALLTHROUGH */
        case MDOC_Brq:
                term_word(p, "{");
                break;
        case MDOC_Oo:
-               /* FALLTHROUGH */
        case MDOC_Op:
-               /* FALLTHROUGH */
        case MDOC_Bo:
-               /* FALLTHROUGH */
        case MDOC_Bq:
                term_word(p, "[");
                break;
        case MDOC_Do:
-               /* FALLTHROUGH */
        case MDOC_Dq:
                term_word(p, "\\(Lq");
                break;
@@ -1895,21 +1860,16 @@ termp_quote_pre(DECL_ARGS)
                term_word(p, n->norm->Es->child->string);
                break;
        case MDOC_Po:
-               /* FALLTHROUGH */
        case MDOC_Pq:
                term_word(p, "(");
                break;
        case MDOC__T:
-               /* FALLTHROUGH */
        case MDOC_Qo:
-               /* FALLTHROUGH */
        case MDOC_Qq:
                term_word(p, "\"");
                break;
        case MDOC_Ql:
-               /* FALLTHROUGH */
        case MDOC_So:
-               /* FALLTHROUGH */
        case MDOC_Sq:
                term_word(p, "\\(oq");
                break;
@@ -1932,27 +1892,21 @@ termp_quote_post(DECL_ARGS)
 
        switch (n->tok) {
        case MDOC_Ao:
-               /* FALLTHROUGH */
        case MDOC_Aq:
                term_word(p, n->nchild == 1 &&
                    n->child->tok == MDOC_Mt ? ">" : "\\(ra");
                break;
        case MDOC_Bro:
-               /* FALLTHROUGH */
        case MDOC_Brq:
                term_word(p, "}");
                break;
        case MDOC_Oo:
-               /* FALLTHROUGH */
        case MDOC_Op:
-               /* FALLTHROUGH */
        case MDOC_Bo:
-               /* FALLTHROUGH */
        case MDOC_Bq:
                term_word(p, "]");
                break;
        case MDOC_Do:
-               /* FALLTHROUGH */
        case MDOC_Dq:
                term_word(p, "\\(Rq");
                break;
@@ -1965,21 +1919,16 @@ termp_quote_post(DECL_ARGS)
                        term_word(p, n->norm->Es->child->next->string);
                break;
        case MDOC_Po:
-               /* FALLTHROUGH */
        case MDOC_Pq:
                term_word(p, ")");
                break;
        case MDOC__T:
-               /* FALLTHROUGH */
        case MDOC_Qo:
-               /* FALLTHROUGH */
        case MDOC_Qq:
                term_word(p, "\"");
                break;
        case MDOC_Ql:
-               /* FALLTHROUGH */
        case MDOC_So:
-               /* FALLTHROUGH */
        case MDOC_Sq:
                term_word(p, "\\(cq");
                break;

diff --git a/usr.bin/mandoc/mdoc_validate.c b/usr.bin/mandoc/mdoc_validate.c
index 0989b3a..99dc15f 100644 (file)
--- a/usr.bin/mandoc/mdoc_validate.c
+++ b/usr.bin/mandoc/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: mdoc_validate.c,v 1.210 2015/10/06 18:30:44 schwarze Exp $ */
+/*     $OpenBSD: mdoc_validate.c,v 1.211 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -299,11 +299,9 @@ mdoc_valid_pre(struct roff_man *mdoc, struct roff_node *n)
        case ROFFT_TEXT:
                if (n->sec != SEC_SYNOPSIS || n->parent->tok != MDOC_Fd)
                        check_text(mdoc, n->line, n->pos, n->string);
-               /* FALLTHROUGH */
+               return;
        case ROFFT_TBL:
-               /* FALLTHROUGH */
        case ROFFT_EQN:
-               /* FALLTHROUGH */
        case ROFFT_ROOT:
                return;
        default:
@@ -329,9 +327,7 @@ mdoc_valid_post(struct roff_man *mdoc)
 
        switch (n->type) {
        case ROFFT_TEXT:
-               /* FALLTHROUGH */
        case ROFFT_EQN:
-               /* FALLTHROUGH */
        case ROFFT_TBL:
                break;
        case ROFFT_ROOT:
@@ -564,13 +560,9 @@ pre_bl(PRE_ARGS)
                            n->line, n->pos, "Bl -tag");
                break;
        case LIST_column:
-               /* FALLTHROUGH */
        case LIST_diag:
-               /* FALLTHROUGH */
        case LIST_ohang:
-               /* FALLTHROUGH */
        case LIST_inset:
-               /* FALLTHROUGH */
        case LIST_item:
                if (n->norm->Bl.width)
                        mandoc_vmsg(MANDOCERR_BL_SKIPW, mdoc->parse,
@@ -578,9 +570,7 @@ pre_bl(PRE_ARGS)
                            mdoc_argnames[mdoclt]);
                break;
        case LIST_bullet:
-               /* FALLTHROUGH */
        case LIST_dash:
-               /* FALLTHROUGH */
        case LIST_hyphen:
                if (NULL == n->norm->Bl.width)
                        n->norm->Bl.width = "2n";
@@ -1022,7 +1012,6 @@ post_defaults(POST_ARGS)
                roff_word_alloc(mdoc, nn->line, nn->pos, "...");
                break;
        case MDOC_Pa:
-               /* FALLTHROUGH */
        case MDOC_Mt:
                roff_word_alloc(mdoc, nn->line, nn->pos, "~");
                break;
@@ -1113,13 +1102,9 @@ post_it(POST_ARGS)
 
        switch (lt) {
        case LIST_tag:
-               /* FALLTHROUGH */
        case LIST_hang:
-               /* FALLTHROUGH */
        case LIST_ohang:
-               /* FALLTHROUGH */
        case LIST_inset:
-               /* FALLTHROUGH */
        case LIST_diag:
                if (nit->head->child == NULL)
                        mandoc_vmsg(MANDOCERR_IT_NOHEAD,
@@ -1128,11 +1113,8 @@ post_it(POST_ARGS)
                            mdoc_argnames[nbl->args->argv[0].arg]);
                break;
        case LIST_bullet:
-               /* FALLTHROUGH */
        case LIST_dash:
-               /* FALLTHROUGH */
        case LIST_enum:
-               /* FALLTHROUGH */
        case LIST_hyphen:
                if (nit->body == NULL || nit->body->child == NULL)
                        mandoc_vmsg(MANDOCERR_IT_NOBODY,
@@ -1193,9 +1175,7 @@ post_bl_block(POST_ARGS)
                while (NULL != nc) {
                        switch (nc->tok) {
                        case MDOC_Pp:
-                               /* FALLTHROUGH */
                        case MDOC_Lp:
-                               /* FALLTHROUGH */
                        case MDOC_br:
                                break;
                        default:
@@ -1928,7 +1908,6 @@ post_sh_head(POST_ARGS)
                goodsec = "2, 3, 4, 9";
                /* FALLTHROUGH */
        case SEC_RETURN_VALUES:
-               /* FALLTHROUGH */
        case SEC_LIBRARY:
                if (*mdoc->meta.msec == '2')
                        break;

diff --git a/usr.bin/mandoc/out.c b/usr.bin/mandoc/out.c
index 4c5a431..5e48487 100644 (file)
--- a/usr.bin/mandoc/out.c
+++ b/usr.bin/mandoc/out.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: out.c,v 1.33 2015/10/06 18:30:44 schwarze Exp $ */
+/*     $OpenBSD: out.c,v 1.34 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -238,18 +238,14 @@ tblcalc_data(struct rofftbl *tbl, struct roffcol *col,
 
        switch (dp->layout->pos) {
        case TBL_CELL_HORIZ:
-               /* FALLTHROUGH */
        case TBL_CELL_DHORIZ:
                sz = (*tbl->len)(1, tbl->arg);
                if (col->width < sz)
                        col->width = sz;
                break;
        case TBL_CELL_LONG:
-               /* FALLTHROUGH */
        case TBL_CELL_CENTRE:
-               /* FALLTHROUGH */
        case TBL_CELL_LEFT:
-               /* FALLTHROUGH */
        case TBL_CELL_RIGHT:
                tblcalc_literal(tbl, col, dp);
                break;

diff --git a/usr.bin/mandoc/roff.c b/usr.bin/mandoc/roff.c
index d4073cf..a991461 100644 (file)
--- a/usr.bin/mandoc/roff.c
+++ b/usr.bin/mandoc/roff.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: roff.c,v 1.149 2015/10/06 18:30:44 schwarze Exp $ */
+/*     $OpenBSD: roff.c,v 1.150 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -1035,7 +1035,6 @@ roff_node_append(struct roff_man *man, struct roff_node *n)
                        break;
                /* FALLTHROUGH */
        case ROFFT_TAIL:
-               /* FALLTHROUGH */
        case ROFFT_HEAD:
                n->norm = n->parent->norm;
                break;
@@ -1333,7 +1332,6 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
                        res = NULL;
                        break;
                case 'B':
-                       /* FALLTHROUGH */
                case 'w':
                        term = cp[1];
                        /* FALLTHROUGH */
@@ -1408,11 +1406,8 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
                        }
                        switch (mandoc_escape(&cp, NULL, NULL)) {
                        case ESCAPE_SPECIAL:
-                               /* FALLTHROUGH */
                        case ESCAPE_UNICODE:
-                               /* FALLTHROUGH */
                        case ESCAPE_NUMBERED:
-                               /* FALLTHROUGH */
                        case ESCAPE_OVERSTRIKE:
                                naml++;
                                break;
@@ -1719,14 +1714,10 @@ roff_cblock(ROFF_ARGS)
        switch (r->last->tok) {
        case ROFF_am:
                /* ROFF_am1 is remapped to ROFF_am in roff_block(). */
-               /* FALLTHROUGH */
        case ROFF_ami:
-               /* FALLTHROUGH */
        case ROFF_de:
                /* ROFF_de1 is remapped to ROFF_de in roff_block(). */
-               /* FALLTHROUGH */
        case ROFF_dei:
-               /* FALLTHROUGH */
        case ROFF_ig:
                break;
        default:
@@ -1768,9 +1759,7 @@ roff_ccond(struct roff *r, int ln, int ppos)
 
        switch (r->last->tok) {
        case ROFF_el:
-               /* FALLTHROUGH */
        case ROFF_ie:
-               /* FALLTHROUGH */
        case ROFF_if:
                break;
        default:
@@ -2057,12 +2046,10 @@ roff_getnum(const char *v, int *pos, int *res, int flags)
                scaled = *res * 240 / 2.54;
                break;
        case 'v':
-               /* FALLTHROUGH */
        case 'P':
                scaled = *res * 40;
                break;
        case 'm':
-               /* FALLTHROUGH */
        case 'n':
                scaled = *res * 24;
                break;
@@ -2151,18 +2138,13 @@ roff_evalcond(struct roff *r, int ln, char *v, int *pos)
        case '\0':
                return 0;
        case 'n':
-               /* FALLTHROUGH */
        case 'o':
                (*pos)++;
                return wanttrue;
        case 'c':
-               /* FALLTHROUGH */
        case 'd':
-               /* FALLTHROUGH */
        case 'e':
-               /* FALLTHROUGH */
        case 't':
-               /* FALLTHROUGH */
        case 'v':
                (*pos)++;
                return !wanttrue;
@@ -2338,17 +2320,11 @@ roff_getop(const char *v, int *pos, char *res)
 
        switch (*res) {
        case '+':
-               /* FALLTHROUGH */
        case '-':
-               /* FALLTHROUGH */
        case '*':
-               /* FALLTHROUGH */
        case '/':
-               /* FALLTHROUGH */
        case '%':
-               /* FALLTHROUGH */
        case '&':
-               /* FALLTHROUGH */
        case ':':
                break;
        case '<':

diff --git a/usr.bin/mandoc/tbl_html.c b/usr.bin/mandoc/tbl_html.c
index de851e3..08e643c 100644 (file)
--- a/usr.bin/mandoc/tbl_html.c
+++ b/usr.bin/mandoc/tbl_html.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: tbl_html.c,v 1.12 2015/10/06 18:30:44 schwarze Exp $ */
+/*     $OpenBSD: tbl_html.c,v 1.13 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -106,7 +106,6 @@ print_tbl(struct html *h, const struct tbl_span *sp)
 
        switch (sp->pos) {
        case TBL_SPAN_HORIZ:
-               /* FALLTHROUGH */
        case TBL_SPAN_DHORIZ:
                PAIR_INIT(&tag, ATTR_COLSPAN, "0");
                print_otag(h, TAG_TD, 1, &tag);

diff --git a/usr.bin/mandoc/tbl_layout.c b/usr.bin/mandoc/tbl_layout.c
index 7fc0cc6..57f21e6 100644 (file)
--- a/usr.bin/mandoc/tbl_layout.c
+++ b/usr.bin/mandoc/tbl_layout.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: tbl_layout.c,v 1.27 2015/10/06 18:30:44 schwarze Exp $ */
+/*     $OpenBSD: tbl_layout.c,v 1.28 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -113,7 +113,6 @@ mod:
                    ln, *pos, "m");
                goto mod;
        case 'p':
-               /* FALLTHROUGH */
        case 'v':
                if (p[*pos] == '-' || p[*pos] == '+')
                        (*pos)++;
@@ -166,17 +165,14 @@ mod:
 
        switch (p[(*pos)++]) {
        case '3':
-               /* FALLTHROUGH */
        case 'B':
                cp->flags |= TBL_CELL_BOLD;
                goto mod;
        case '2':
-               /* FALLTHROUGH */
        case 'I':
                cp->flags |= TBL_CELL_ITALIC;
                goto mod;
        case '1':
-               /* FALLTHROUGH */
        case 'R':
                goto mod;
        default:

diff --git a/usr.bin/mandoc/tbl_term.c b/usr.bin/mandoc/tbl_term.c
index cda6cc2..531b59c 100644 (file)
--- a/usr.bin/mandoc/tbl_term.c
+++ b/usr.bin/mandoc/tbl_term.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: tbl_term.c,v 1.30 2015/10/06 18:30:44 schwarze Exp $ */
+/*     $OpenBSD: tbl_term.c,v 1.31 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -264,12 +264,10 @@ tbl_data(struct termp *tp, const struct tbl_opts *opts,
                tbl_char(tp, ASCII_NBRSP, col->width);
                return;
        case TBL_DATA_HORIZ:
-               /* FALLTHROUGH */
        case TBL_DATA_NHORIZ:
                tbl_char(tp, '-', col->width);
                return;
        case TBL_DATA_NDHORIZ:
-               /* FALLTHROUGH */
        case TBL_DATA_DHORIZ:
                tbl_char(tp, '=', col->width);
                return;
@@ -285,11 +283,8 @@ tbl_data(struct termp *tp, const struct tbl_opts *opts,
                tbl_char(tp, '=', col->width);
                break;
        case TBL_CELL_LONG:
-               /* FALLTHROUGH */
        case TBL_CELL_CENTRE:
-               /* FALLTHROUGH */
        case TBL_CELL_LEFT:
-               /* FALLTHROUGH */
        case TBL_CELL_RIGHT:
                tbl_literal(tp, dp, col);
                break;

diff --git a/usr.bin/mandoc/term.c b/usr.bin/mandoc/term.c
index a451658..b454148 100644 (file)
--- a/usr.bin/mandoc/term.c
+++ b/usr.bin/mandoc/term.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: term.c,v 1.112 2015/10/06 18:30:44 schwarze Exp $ */
+/*     $OpenBSD: term.c,v 1.113 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -472,7 +472,6 @@ term_word(struct termp *p, const char *word)
                        term_fontrepl(p, TERMFONT_BI);
                        continue;
                case ESCAPE_FONT:
-                       /* FALLTHROUGH */
                case ESCAPE_FONTROMAN:
                        term_fontrepl(p, TERMFONT_NONE);
                        continue;
@@ -769,8 +768,6 @@ term_strlen(const struct termp *p, const char *cp)
                case ASCII_HYPH:
                        sz += cond_width(p, '-', &skip);
                        cp++;
-                       /* FALLTHROUGH */
-               case ASCII_BREAK:
                        break;
                default:
                        break;
@@ -809,7 +806,6 @@ term_vspan(const struct termp *p, const struct roffsu *su)
                r = su->scale / 12.0;
                break;
        case SCALE_EN:
-               /* FALLTHROUGH */
        case SCALE_EM:
                r = su->scale * 0.6;
                break;

diff --git a/usr.bin/mandoc/term_ascii.c b/usr.bin/mandoc/term_ascii.c
index a9df045..03fcb92 100644 (file)
--- a/usr.bin/mandoc/term_ascii.c
+++ b/usr.bin/mandoc/term_ascii.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: term_ascii.c,v 1.35 2015/10/06 18:30:44 schwarze Exp $ */
+/*     $OpenBSD: term_ascii.c,v 1.36 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -234,7 +234,6 @@ ascii_hspan(const struct termp *p, const struct roffsu *su)
                r = su->scale * 0.24;
                break;
        case SCALE_VS:
-               /* FALLTHROUGH */
        case SCALE_PC:
                r = su->scale * 40.0;
                break;
@@ -242,7 +241,6 @@ ascii_hspan(const struct termp *p, const struct roffsu *su)
                r = su->scale * 10.0 / 3.0;
                break;
        case SCALE_EN:
-               /* FALLTHROUGH */
        case SCALE_EM:
                r = su->scale * 24.0;
                break;

diff --git a/usr.bin/mandoc/term_ps.c b/usr.bin/mandoc/term_ps.c
index 9648cf3..09c6610 100644 (file)
--- a/usr.bin/mandoc/term_ps.c
+++ b/usr.bin/mandoc/term_ps.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: term_ps.c,v 1.41 2015/10/11 21:07:00 schwarze Exp $ */
+/*     $OpenBSD: term_ps.c,v 1.42 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -981,9 +981,7 @@ ps_pletter(struct termp *p, int c)
 
        switch (c) {
        case '(':
-               /* FALLTHROUGH */
        case ')':
-               /* FALLTHROUGH */
        case '\\':
                ps_putchar(p, '\\');
                break;

diff --git a/usr.bin/mandoc/tree.c b/usr.bin/mandoc/tree.c
index 0d04e43..97eea5d 100644 (file)
--- a/usr.bin/mandoc/tree.c
+++ b/usr.bin/mandoc/tree.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: tree.c,v 1.35 2015/09/26 12:54:18 schwarze Exp $ */
+/*     $OpenBSD: tree.c,v 1.36 2015/10/12 00:07:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -222,11 +222,8 @@ print_man(const struct roff_node *n, int indent)
                p = n->string;
                break;
        case ROFFT_ELEM:
-               /* FALLTHROUGH */
        case ROFFT_BLOCK:
-               /* FALLTHROUGH */
        case ROFFT_HEAD:
-               /* FALLTHROUGH */
        case ROFFT_BODY:
                p = man_macronames[n->tok];
                break;
@@ -355,12 +352,10 @@ print_span(const struct tbl_span *sp, int indent)
        for (dp = sp->first; dp; dp = dp->next) {
                switch (dp->pos) {
                case TBL_DATA_HORIZ:
-                       /* FALLTHROUGH */
                case TBL_DATA_NHORIZ:
                        putchar('-');
                        continue;
                case TBL_DATA_DHORIZ:
-                       /* FALLTHROUGH */
                case TBL_DATA_NDHORIZ:
                        putchar('=');
                        continue;