=================================================================== RCS file: /cvs/mandoc/tbl_term.c,v retrieving revision 1.39 retrieving revision 1.43 diff -u -p -r1.39 -r1.43 --- mandoc/tbl_term.c 2015/03/06 11:03:03 1.39 +++ mandoc/tbl_term.c 2015/10/12 00:08:16 1.43 @@ -1,4 +1,4 @@ -/* $Id: tbl_term.c,v 1.39 2015/03/06 11:03:03 schwarze Exp $ */ +/* $Id: tbl_term.c,v 1.43 2015/10/12 00:08:16 schwarze Exp $ */ /* * Copyright (c) 2009, 2011 Kristaps Dzonsons * Copyright (c) 2011, 2012, 2014, 2015 Ingo Schwarze @@ -47,14 +47,14 @@ static size_t term_tbl_strlen(const char *p, void *arg) { - return(term_strlen((const struct termp *)arg, p)); + return term_strlen((const struct termp *)arg, p); } static size_t term_tbl_len(size_t sz, void *arg) { - return(term_len((const struct termp *)arg, sz)); + return term_len((const struct termp *)arg, sz); } void @@ -66,9 +66,6 @@ term_tbl(struct termp *tp, const struct tbl_span *sp) size_t rmargin, maxrmargin, tsz; int ic, horiz, spans, vert; - if (tp->tbl.cols == NULL) - term_flushln(tp); - rmargin = tp->rmargin; maxrmargin = tp->maxrmargin; @@ -269,12 +266,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; @@ -290,11 +285,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; @@ -306,7 +298,6 @@ tbl_data(struct termp *tp, const struct tbl_opts *opts break; default: abort(); - /* NOTREACHED */ } }