* mdocml: To make the code more readable, delete 283 /* FALLTHROUGH */
@ 2015-10-12 0:08 schwarze
0 siblings, 0 replies; only message in thread
From: schwarze @ 2015-10-12 0:08 UTC (permalink / raw)
To: source
Log Message:
-----------
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.
Modified Files:
--------------
mdocml:
html.c
main.c
man_term.c
man_validate.c
mandoc.c
mandocdb.c
mdoc.c
mdoc_html.c
mdoc_macro.c
mdoc_man.c
mdoc_term.c
mdoc_validate.c
out.c
roff.c
tbl_html.c
tbl_layout.c
tbl_term.c
term.c
term_ascii.c
term_ps.c
tree.c
Revision Data
-------------
Index: man_validate.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/man_validate.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -Lman_validate.c -Lman_validate.c -u -p -r1.119 -r1.120
--- man_validate.c
+++ man_validate.c
@@ -117,7 +117,6 @@ man_valid_post(struct roff_man *man)
check_root(man, n);
break;
case ROFFT_EQN:
- /* FALLTHROUGH */
case ROFFT_TBL:
break;
default:
@@ -207,17 +206,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;
@@ -499,7 +492,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],
Index: mdoc_macro.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mdoc_macro.c,v
retrieving revision 1.202
retrieving revision 1.203
diff -Lmdoc_macro.c -Lmdoc_macro.c -u -p -r1.202 -r1.203
--- mdoc_macro.c
+++ mdoc_macro.c
@@ -734,15 +734,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;
@@ -946,7 +941,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,
@@ -1289,16 +1283,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;
Index: mandocdb.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandocdb.c,v
retrieving revision 1.198
retrieving revision 1.199
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.198 -r1.199
--- mandocdb.c
+++ mandocdb.c
@@ -693,7 +693,6 @@ treescan(void)
continue;
case FTS_D:
- /* FALLTHROUGH */
case FTS_DP:
break;
@@ -1563,13 +1562,9 @@ parse_mdoc(struct mpage *mpage, const st
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))
@@ -1922,7 +1917,6 @@ render_string(char **public, size_t *psz
case '\\':
break;
case '\t':
- /* FALLTHROUGH */
case ASCII_NBRSP:
dst[dsz++] = ' ';
scp++;
Index: html.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/html.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -Lhtml.c -Lhtml.c -u -p -r1.188 -r1.189
--- html.c
+++ html.c
@@ -218,7 +218,6 @@ print_metaf(struct html *h, enum mandoc_
font = HTMLFONT_BI;
break;
case ESCAPE_FONT:
- /* FALLTHROUGH */
case ESCAPE_FONTROMAN:
font = HTMLFONT_NONE;
break;
@@ -283,11 +282,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;
@@ -326,7 +322,7 @@ print_escape(char c)
break;
case ASCII_HYPH:
putchar('-');
- /* FALLTHROUGH */
+ break;
case ASCII_BREAK:
break;
default:
@@ -371,15 +367,10 @@ print_encode(struct html *h, const char
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);
Index: mdoc_validate.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mdoc_validate.c,v
retrieving revision 1.294
retrieving revision 1.295
diff -Lmdoc_validate.c -Lmdoc_validate.c -u -p -r1.294 -r1.295
--- mdoc_validate.c
+++ mdoc_validate.c
@@ -301,11 +301,9 @@ mdoc_valid_pre(struct roff_man *mdoc, st
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:
@@ -331,9 +329,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:
@@ -566,13 +562,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,
@@ -580,9 +572,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";
@@ -1031,7 +1021,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;
@@ -1122,13 +1111,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,
@@ -1137,11 +1122,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,
@@ -1202,9 +1184,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:
@@ -1937,7 +1917,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;
Index: term_ascii.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/term_ascii.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -Lterm_ascii.c -Lterm_ascii.c -u -p -r1.49 -r1.50
--- term_ascii.c
+++ term_ascii.c
@@ -246,7 +246,6 @@ ascii_hspan(const struct termp *p, const
r = su->scale * 0.24;
break;
case SCALE_VS:
- /* FALLTHROUGH */
case SCALE_PC:
r = su->scale * 40.0;
break;
@@ -254,7 +253,6 @@ ascii_hspan(const struct termp *p, const
r = su->scale * 10.0 / 3.0;
break;
case SCALE_EN:
- /* FALLTHROUGH */
case SCALE_EM:
r = su->scale * 24.0;
break;
Index: tbl_html.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/tbl_html.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -Ltbl_html.c -Ltbl_html.c -u -p -r1.17 -r1.18
--- tbl_html.c
+++ tbl_html.c
@@ -108,7 +108,6 @@ print_tbl(struct html *h, const struct t
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);
Index: mdoc_man.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mdoc_man.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -Lmdoc_man.c -Lmdoc_man.c -u -p -r1.94 -r1.95
--- mdoc_man.c
+++ mdoc_man.c
@@ -818,13 +818,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;
@@ -1375,9 +1371,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);
@@ -1386,9 +1380,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;
@@ -1478,15 +1470,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;
@@ -1600,7 +1587,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();
Index: tbl_layout.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/tbl_layout.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -Ltbl_layout.c -Ltbl_layout.c -u -p -r1.40 -r1.41
--- tbl_layout.c
+++ tbl_layout.c
@@ -115,7 +115,6 @@ mod:
ln, *pos, "m");
goto mod;
case 'p':
- /* FALLTHROUGH */
case 'v':
if (p[*pos] == '-' || p[*pos] == '+')
(*pos)++;
@@ -168,17 +167,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:
Index: tree.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/tree.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -Ltree.c -Ltree.c -u -p -r1.68 -r1.69
--- tree.c
+++ tree.c
@@ -224,11 +224,8 @@ print_man(const struct roff_node *n, int
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;
@@ -357,12 +354,10 @@ print_span(const struct tbl_span *sp, in
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;
Index: roff.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/roff.c,v
retrieving revision 1.277
retrieving revision 1.278
diff -Lroff.c -Lroff.c -u -p -r1.277 -r1.278
--- roff.c
+++ roff.c
@@ -1037,7 +1037,6 @@ roff_node_append(struct roff_man *man, s
break;
/* FALLTHROUGH */
case ROFFT_TAIL:
- /* FALLTHROUGH */
case ROFFT_HEAD:
n->norm = n->parent->norm;
break;
@@ -1335,7 +1334,6 @@ roff_res(struct roff *r, struct buf *buf
res = NULL;
break;
case 'B':
- /* FALLTHROUGH */
case 'w':
term = cp[1];
/* FALLTHROUGH */
@@ -1410,11 +1408,8 @@ roff_res(struct roff *r, struct buf *buf
}
switch (mandoc_escape(&cp, NULL, NULL)) {
case ESCAPE_SPECIAL:
- /* FALLTHROUGH */
case ESCAPE_UNICODE:
- /* FALLTHROUGH */
case ESCAPE_NUMBERED:
- /* FALLTHROUGH */
case ESCAPE_OVERSTRIKE:
naml++;
break;
@@ -1721,14 +1716,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:
@@ -1770,9 +1761,7 @@ roff_ccond(struct roff *r, int ln, int p
switch (r->last->tok) {
case ROFF_el:
- /* FALLTHROUGH */
case ROFF_ie:
- /* FALLTHROUGH */
case ROFF_if:
break;
default:
@@ -2059,12 +2048,10 @@ roff_getnum(const char *v, int *pos, int
scaled = *res * 240 / 2.54;
break;
case 'v':
- /* FALLTHROUGH */
case 'P':
scaled = *res * 40;
break;
case 'm':
- /* FALLTHROUGH */
case 'n':
scaled = *res * 24;
break;
@@ -2153,18 +2140,13 @@ roff_evalcond(struct roff *r, int ln, ch
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;
@@ -2340,17 +2322,11 @@ roff_getop(const char *v, int *pos, char
switch (*res) {
case '+':
- /* FALLTHROUGH */
case '-':
- /* FALLTHROUGH */
case '*':
- /* FALLTHROUGH */
case '/':
- /* FALLTHROUGH */
case '%':
- /* FALLTHROUGH */
case '&':
- /* FALLTHROUGH */
case ':':
break;
case '<':
Index: mdoc.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mdoc.c,v
retrieving revision 1.253
retrieving revision 1.254
diff -Lmdoc.c -Lmdoc.c -u -p -r1.253 -r1.254
--- mdoc.c
+++ mdoc.c
@@ -182,13 +182,9 @@ mdoc_block_alloc(struct roff_man *mdoc,
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;
@@ -472,25 +468,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:
Index: tbl_term.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/tbl_term.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -Ltbl_term.c -Ltbl_term.c -u -p -r1.42 -r1.43
--- tbl_term.c
+++ tbl_term.c
@@ -266,12 +266,10 @@ tbl_data(struct termp *tp, const struct
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;
@@ -287,11 +285,8 @@ tbl_data(struct termp *tp, const struct
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;
Index: term.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/term.c,v
retrieving revision 1.252
retrieving revision 1.253
diff -Lterm.c -Lterm.c -u -p -r1.252 -r1.253
--- term.c
+++ term.c
@@ -474,7 +474,6 @@ term_word(struct termp *p, const char *w
term_fontrepl(p, TERMFONT_BI);
continue;
case ESCAPE_FONT:
- /* FALLTHROUGH */
case ESCAPE_FONTROMAN:
term_fontrepl(p, TERMFONT_NONE);
continue;
@@ -771,8 +770,6 @@ term_strlen(const struct termp *p, const
case ASCII_HYPH:
sz += cond_width(p, '-', &skip);
cp++;
- /* FALLTHROUGH */
- case ASCII_BREAK:
break;
default:
break;
@@ -811,7 +808,6 @@ term_vspan(const struct termp *p, const
r = su->scale / 12.0;
break;
case SCALE_EN:
- /* FALLTHROUGH */
case SCALE_EM:
r = su->scale * 0.6;
break;
Index: man_term.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/man_term.c,v
retrieving revision 1.185
retrieving revision 1.186
diff -Lman_term.c -Lman_term.c -u -p -r1.185 -r1.186
--- man_term.c
+++ man_term.c
@@ -371,14 +371,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;
@@ -386,9 +383,7 @@ pre_ft(DECL_ARGS)
term_fontlast(p);
break;
case '1':
- /* FALLTHROUGH */
case 'C':
- /* FALLTHROUGH */
case 'R':
term_fontrepl(p, TERMFONT_NONE);
break;
@@ -449,15 +444,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;
Index: main.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/main.c,v
retrieving revision 1.247
retrieving revision 1.248
diff -Lmain.c -Lmain.c -u -p -r1.247 -r1.248
--- main.c
+++ main.c
@@ -709,13 +709,9 @@ parse(struct curparse *curp, int fd, con
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;
@@ -896,7 +892,6 @@ woptions(struct curparse *curp, char *ar
curp->wstop = 1;
break;
case 1:
- /* FALLTHROUGH */
case 2:
curp->wlevel = MANDOCLEVEL_WARNING;
break;
Index: mdoc_html.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mdoc_html.c,v
retrieving revision 1.237
retrieving revision 1.238
diff -Lmdoc_html.c -Lmdoc_html.c -u -p -r1.237 -r1.238
--- mdoc_html.c
+++ mdoc_html.c
@@ -299,13 +299,9 @@ synopsis_pre(struct html *h, const struc
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;
@@ -826,23 +822,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);
@@ -861,13 +849,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);
@@ -875,13 +859,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);
@@ -973,11 +953,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;
@@ -985,13 +962,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;
@@ -1173,19 +1146,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:
@@ -2065,23 +2031,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;
@@ -2095,16 +2057,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;
@@ -2115,7 +2073,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;
@@ -2138,22 +2095,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;
@@ -2166,23 +2118,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;
Index: mandoc.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandoc.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -Lmandoc.c -Lmandoc.c -u -p -r1.94 -r1.95
--- mandoc.c
+++ mandoc.c
@@ -93,11 +93,8 @@ mandoc_escape(const char **end, const ch
* Escapes taking no arguments at all.
*/
case 'd':
- /* FALLTHROUGH */
case 'u':
- /* FALLTHROUGH */
case ',':
- /* FALLTHROUGH */
case '/':
return ESCAPE_IGNORE;
@@ -115,19 +112,12 @@ mandoc_escape(const char **end, const ch
* '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 */
@@ -155,15 +145,10 @@ mandoc_escape(const char **end, const ch
* 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 */
@@ -181,17 +166,11 @@ mandoc_escape(const char **end, const ch
* 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)
@@ -247,9 +226,7 @@ mandoc_escape(const char **end, const ch
term = '\'';
break;
case '3':
- /* FALLTHROUGH */
case '2':
- /* FALLTHROUGH */
case '1':
*sz = (*end)[-1] == 's' &&
isdigit((unsigned char)(*end)[1]) ? 2 : 1;
@@ -325,12 +302,10 @@ mandoc_escape(const char **end, const ch
switch (**start) {
case '3':
- /* FALLTHROUGH */
case 'B':
gly = ESCAPE_FONTBOLD;
break;
case '2':
- /* FALLTHROUGH */
case 'I':
gly = ESCAPE_FONTITALIC;
break;
@@ -338,7 +313,6 @@ mandoc_escape(const char **end, const ch
gly = ESCAPE_FONTPREV;
break;
case '1':
- /* FALLTHROUGH */
case 'R':
gly = ESCAPE_FONTROMAN;
break;
@@ -563,19 +537,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;
Index: mdoc_term.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mdoc_term.c,v
retrieving revision 1.328
retrieving revision 1.329
diff -Lmdoc_term.c -Lmdoc_term.c -u -p -r1.328 -r1.329
--- mdoc_term.c
+++ mdoc_term.c
@@ -625,11 +625,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;
@@ -637,7 +634,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;
@@ -762,16 +758,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)
@@ -854,13 +847,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;
@@ -896,7 +885,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");
@@ -918,13 +906,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;
@@ -952,9 +936,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);
@@ -1293,13 +1275,9 @@ synopsis_pre(struct termp *p, const stru
*/
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;
@@ -1617,19 +1595,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:
@@ -1866,27 +1837,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;
@@ -1897,21 +1862,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;
@@ -1934,27 +1894,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;
@@ -1967,21 +1921,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;
Index: term_ps.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/term_ps.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -Lterm_ps.c -Lterm_ps.c -u -p -r1.76 -r1.77
--- term_ps.c
+++ term_ps.c
@@ -986,9 +986,7 @@ ps_pletter(struct termp *p, int c)
switch (c) {
case '(':
- /* FALLTHROUGH */
case ')':
- /* FALLTHROUGH */
case '\\':
ps_putchar(p, '\\');
break;
Index: out.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/out.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -Lout.c -Lout.c -u -p -r1.61 -r1.62
--- out.c
+++ out.c
@@ -240,18 +240,14 @@ tblcalc_data(struct rofftbl *tbl, struct
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;
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-10-12 0:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-12 0:08 mdocml: To make the code more readable, delete 283 /* FALLTHROUGH */ schwarze
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).