=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.251 retrieving revision 1.253 diff -u -p -r1.251 -r1.253 --- mandoc/term.c 2015/09/26 00:54:04 1.251 +++ mandoc/term.c 2015/10/12 00:08:16 1.253 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.251 2015/09/26 00:54:04 schwarze Exp $ */ +/* $Id: term.c,v 1.253 2015/10/12 00:08:16 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010-2015 Ingo Schwarze @@ -474,7 +474,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; @@ -644,7 +643,7 @@ size_t term_len(const struct termp *p, size_t sz) { - return((*p->width)(p, ' ') * sz); + return (*p->width)(p, ' ') * sz; } static size_t @@ -653,9 +652,9 @@ cond_width(const struct termp *p, int c, int *skip) if (*skip) { (*skip) = 0; - return(0); + return 0; } else - return((*p->width)(p, c)); + return (*p->width)(p, c); } size_t @@ -771,15 +770,13 @@ 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; } } - return(sz); + return sz; } int @@ -811,7 +808,6 @@ term_vspan(const struct termp *p, const struct roffsu r = su->scale / 12.0; break; case SCALE_EN: - /* FALLTHROUGH */ case SCALE_EM: r = su->scale * 0.6; break; @@ -822,7 +818,7 @@ term_vspan(const struct termp *p, const struct roffsu abort(); } ri = r > 0.0 ? r + 0.4995 : r - 0.4995; - return(ri < 66 ? ri : 1); + return ri < 66 ? ri : 1; } /* @@ -832,5 +828,5 @@ int term_hspan(const struct termp *p, const struct roffsu *su) { - return((*p->hspan)(p, su)); + return (*p->hspan)(p, su); }