prevent the skipvsp flag from creeping past actual text

[mandoc.git] / tbl.c

diff --git a/tbl.c b/tbl.c
index 935e43c05972bd1462e4c5d339a6f13af8db1fe0..00ee4661254b49b00ef3de7f515a0a144fa90e08 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl.c,v 1.36 2015/01/28 17:32:07 schwarze Exp $ */
+/*     $Id: tbl.c,v 1.39 2015/01/30 17:32:16 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -91,7 +91,7 @@ tbl_alloc(int pos, int line, struct mparse *parse)
 {
        struct tbl_node *tbl;
 
-       tbl = mandoc_calloc(1, sizeof(struct tbl_node));
+       tbl = mandoc_calloc(1, sizeof(*tbl));
        tbl->line = line;
        tbl->pos = pos;
        tbl->parse = parse;
@@ -108,11 +108,10 @@ tbl_free(struct tbl_node *tbl)
        struct tbl_cell *cp;
        struct tbl_span *sp;
        struct tbl_dat  *dp;
-       struct tbl_head *hp;
 
-       while (NULL != (rp = tbl->first_row)) {
+       while ((rp = tbl->first_row) != NULL) {
                tbl->first_row = rp->next;
-               while (rp->first) {
+               while (rp->first != NULL) {
                        cp = rp->first;
                        rp->first = cp->next;
                        free(cp);
@@ -120,23 +119,17 @@ tbl_free(struct tbl_node *tbl)
                free(rp);
        }
 
-       while (NULL != (sp = tbl->first_span)) {
+       while ((sp = tbl->first_span) != NULL) {
                tbl->first_span = sp->next;
-               while (sp->first) {
+               while (sp->first != NULL) {
                        dp = sp->first;
                        sp->first = dp->next;
-                       if (dp->string)
-                               free(dp->string);
+                       free(dp->string);
                        free(dp);
                }
                free(sp);
        }
 
-       while (NULL != (hp = tbl->first_head)) {
-               tbl->first_head = hp->next;
-               free(hp);
-       }
-
        free(tbl);
 }
 
@@ -186,9 +179,5 @@ tbl_end(struct tbl_node **tblp)
                    tbl->line, tbl->pos, NULL);
                return(0);
        }
-
-       if (tbl->last_span != NULL)
-               tbl->last_span->flags |= TBL_SPAN_LAST;
-
        return(1);
 }