Fix two minibugs reported by Thomas Klausner <wiz at NetBSD>:

[mandoc.git] / tbl.c

diff --git a/tbl.c b/tbl.c
index 771dd9b46f9170aa1897a400dcb82806da336743..bfed242b9d9e231a732a0ecdc3bafcc9e4087d7a 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl.c,v 1.22 2011/01/25 12:24:27 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,6 +15,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "config.h"
+
+#include <sys/types.h>
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,10 +26,11 @@
 #include <time.h>
 
 #include "mandoc.h"
-#include "roff.h"
+#include "mandoc_aux.h"
 #include "libmandoc.h"
 #include "libroff.h"
 
+
 enum rofferr
 tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs)
 {
@@ -49,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;
@@ -67,24 +72,23 @@ tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs)
 }
 
 struct tbl_node *
-tbl_alloc(int pos, int line, void *data, const mandocmsg msg)
+tbl_alloc(int pos, int line, struct mparse *parse)
 {
-       struct tbl_node *p;
-
-       p = mandoc_calloc(1, sizeof(struct tbl_node));
-       p->line = line;
-       p->pos = pos;
-       p->data = data;
-       p->msg = msg;
-       p->part = TBL_PART_OPTS;
-       p->opts.tab = '\t';
-       p->opts.linesize = 12;
-       p->opts.decimal = '.';
-       return(p);
+       struct tbl_node *tbl;
+
+       tbl = mandoc_calloc(1, sizeof(struct tbl_node));
+       tbl->line = line;
+       tbl->pos = pos;
+       tbl->parse = parse;
+       tbl->part = TBL_PART_OPTS;
+       tbl->opts.tab = '\t';
+       tbl->opts.linesize = 12;
+       tbl->opts.decimal = '.';
+       return(tbl);
 }
 
 void
-tbl_free(struct tbl_node *p)
+tbl_free(struct tbl_node *tbl)
 {
        struct tbl_row  *rp;
        struct tbl_cell *cp;
@@ -92,8 +96,8 @@ tbl_free(struct tbl_node *p)
        struct tbl_dat  *dp;
        struct tbl_head *hp;
 
-       while (NULL != (rp = p->first_row)) {
-               p->first_row = rp->next;
+       while (NULL != (rp = tbl->first_row)) {
+               tbl->first_row = rp->next;
                while (rp->first) {
                        cp = rp->first;
                        rp->first = cp->next;
@@ -102,8 +106,8 @@ tbl_free(struct tbl_node *p)
                free(rp);
        }
 
-       while (NULL != (sp = p->first_span)) {
-               p->first_span = sp->next;
+       while (NULL != (sp = tbl->first_span)) {
+               tbl->first_span = sp->next;
                while (sp->first) {
                        dp = sp->first;
                        sp->first = dp->next;
@@ -114,26 +118,28 @@ tbl_free(struct tbl_node *p)
                free(sp);
        }
 
-       while (NULL != (hp = p->first_head)) {
-               p->first_head = hp->next;
+       while (NULL != (hp = tbl->first_head)) {
+               tbl->first_head = hp->next;
                free(hp);
        }
 
-       free(p);
+       free(tbl);
 }
 
 void
 tbl_restart(int line, int pos, struct tbl_node *tbl)
 {
        if (TBL_PART_CDATA == tbl->part)
-               TBL_MSG(tbl, MANDOCERR_TBLBLOCK, tbl->line, tbl->pos);
+               mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse,
+                   tbl->line, tbl->pos, NULL);
 
        tbl->part = TBL_PART_LAYOUT;
        tbl->line = line;
        tbl->pos = pos;
 
        if (NULL == tbl->first_span || NULL == tbl->first_span->first)
-               TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos);
+               mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,
+                   tbl->line, tbl->pos, NULL);
 }
 
 const struct tbl_span *
@@ -150,16 +156,21 @@ tbl_span(struct tbl_node *tbl)
 }
 
 void
-tbl_end(struct tbl_node *tbl)
+tbl_end(struct tbl_node **tblp)
 {
+       struct tbl_node *tbl;
+
+       tbl = *tblp;
+       *tblp = NULL;
 
        if (NULL == tbl->first_span || NULL == tbl->first_span->first)
-               TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos);
+               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)
-               TBL_MSG(tbl, MANDOCERR_TBLBLOCK, tbl->line, tbl->pos);
+               mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse,
+                   tbl->line, tbl->pos, NULL);
 }
-