=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/tbl.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- src/usr.bin/mandoc/tbl.c 2014/03/21 22:17:01 1.9 +++ src/usr.bin/mandoc/tbl.c 2014/04/20 16:44:44 1.10 @@ -1,4 +1,4 @@ -/* $Id: tbl.c,v 1.9 2014/03/21 22:17:01 schwarze Exp $ */ +/* $Id: tbl.c,v 1.10 2014/04/20 16:44:44 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2011 Ingo Schwarze @@ -26,6 +26,7 @@ #include "libmandoc.h" #include "libroff.h" + enum rofferr tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs) { @@ -49,11 +50,11 @@ /* Now process each logical section of the table. */ switch (tbl->part) { - case (TBL_PART_OPTS): + case TBL_PART_OPTS: return(tbl_option(tbl, ln, p) ? ROFF_IGN : ROFF_ERR); - case (TBL_PART_LAYOUT): + case TBL_PART_LAYOUT: return(tbl_layout(tbl, ln, p) ? ROFF_IGN : ROFF_ERR); - case (TBL_PART_CDATA): + case TBL_PART_CDATA: return(tbl_cdata(tbl, ln, p) ? ROFF_TBL : ROFF_IGN); default: break; @@ -125,8 +126,8 @@ tbl_restart(int line, int pos, struct tbl_node *tbl) { if (TBL_PART_CDATA == tbl->part) - mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse, - tbl->line, tbl->pos, NULL); + mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse, + tbl->line, tbl->pos, NULL); tbl->part = TBL_PART_LAYOUT; tbl->line = line; @@ -134,7 +135,7 @@ if (NULL == tbl->first_span || NULL == tbl->first_span->first) mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse, - tbl->line, tbl->pos, NULL); + tbl->line, tbl->pos, NULL); } const struct tbl_span * @@ -159,14 +160,13 @@ *tblp = NULL; if (NULL == tbl->first_span || NULL == tbl->first_span->first) - mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse, - tbl->line, tbl->pos, NULL); + mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse, + tbl->line, tbl->pos, NULL); if (tbl->last_span) tbl->last_span->flags |= TBL_SPAN_LAST; if (TBL_PART_CDATA == tbl->part) - mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse, - tbl->line, tbl->pos, NULL); + mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse, + tbl->line, tbl->pos, NULL); } -