Grrr, patch(1) merged the new function to the wrong place in this file.

[mandoc.git] / tbl.c

diff --git a/tbl.c b/tbl.c
index a99436ed7e7f5662c2be4d8ced950f02c5338a71..bfed242b9d9e231a732a0ecdc3bafcc9e4087d7a 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl.c,v 1.28 2014/03/23 11:25:26 schwarze Exp $ */
+/*     $Id: tbl.c,v 1.30 2014/08/10 23:54:41 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,9 +15,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+
+#include <sys/types.h>
 
 #include <assert.h>
 #include <stdio.h>
@@ -30,6 +30,7 @@
 #include "libmandoc.h"
 #include "libroff.h"
 
+
 enum rofferr
 tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs)
 {
@@ -53,11 +54,11 @@ tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs)
        /* 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;
@@ -129,8 +130,8 @@ void
 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;
@@ -138,7 +139,7 @@ tbl_restart(int line, int pos, struct tbl_node *tbl)
 
        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 *
@@ -163,14 +164,13 @@ tbl_end(struct tbl_node **tblp)
        *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);
 }
-