1. Eliminate struct eqn, instead use the existing members

[mandoc.git] / tbl.c

diff --git a/tbl.c b/tbl.c
index 935e43c05972bd1462e4c5d339a6f13af8db1fe0..a5aa5ae5fd662abcdacc58b3fd61e640e15a7a51 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.41 2017/06/08 18:11:22 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -66,7 +66,7 @@ tbl_read(struct tbl_node *tbl, int ln, const char *p, int pos)
                if (*cp == ';') {
                        tbl_option(tbl, ln, p, &pos);
                        if (p[pos] == '\0')
-                               return(ROFF_IGN);
+                               return ROFF_IGN;
                }
        }
 
@@ -75,15 +75,15 @@ tbl_read(struct tbl_node *tbl, int ln, const char *p, int pos)
        switch (tbl->part) {
        case TBL_PART_LAYOUT:
                tbl_layout(tbl, ln, p, pos);
-               return(ROFF_IGN);
+               return ROFF_IGN;
        case TBL_PART_CDATA:
-               return(tbl_cdata(tbl, ln, p, pos) ? ROFF_TBL : ROFF_IGN);
+               return tbl_cdata(tbl, ln, p, pos) ? ROFF_TBL : ROFF_IGN;
        default:
                break;
        }
 
        tbl_data(tbl, ln, p, pos);
-       return(ROFF_TBL);
+       return ROFF_TBL;
 }
 
 struct tbl_node *
@@ -91,14 +91,14 @@ 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;
        tbl->part = TBL_PART_OPTS;
        tbl->opts.tab = '\t';
        tbl->opts.decimal = '.';
-       return(tbl);
+       return tbl;
 }
 
 void
@@ -108,35 +108,29 @@ 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->wstr);
                        free(cp);
                }
                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);
 }
 
@@ -162,7 +156,7 @@ tbl_span(struct tbl_node *tbl)
                                 : tbl->first_span;
        if (span)
                tbl->current_span = span;
-       return(span);
+       return span;
 }
 
 int
@@ -184,11 +178,7 @@ tbl_end(struct tbl_node **tblp)
        if (sp == NULL) {
                mandoc_msg(MANDOCERR_TBLDATA_NONE, tbl->parse,
                    tbl->line, tbl->pos, NULL);
-               return(0);
+               return 0;
        }
-
-       if (tbl->last_span != NULL)
-               tbl->last_span->flags |= TBL_SPAN_LAST;
-
-       return(1);
+       return 1;
 }