Cleanup, no functional change:

[mandoc.git] / eqn.c

diff --git a/eqn.c b/eqn.c
index d31ef5f810c37e3087a3014b3d705eb45410b5e4..5f4e8ae6fd1d600e298ee618f956f8e02142aea1 100644 (file)
--- a/eqn.c
+++ b/eqn.c
@@ -1,4 +1,4 @@
-/*     $Id: eqn.c,v 1.79 2018/12/12 21:54:35 schwarze Exp $ */
+/*     $Id: eqn.c,v 1.80 2018/12/13 03:40:13 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -30,9 +30,8 @@
 #include "mandoc_aux.h"
 #include "mandoc.h"
 #include "roff.h"
-#include "tbl.h"
 #include "libmandoc.h"
-#include "libroff.h"
+#include "eqn_parse.h"
 
 #define        EQN_NEST_MAX     128 /* maximum nesting of defines */
 #define        STRNEQ(p1, sz1, p2, sz2) \
@@ -285,6 +284,13 @@ enum       parse_mode {
        MODE_TOK
 };
 
+struct eqn_def {
+       char             *key;
+       size_t            keysz;
+       char             *val;
+       size_t            valsz;
+};
+
 static struct eqn_box  *eqn_box_alloc(struct eqn_node *, struct eqn_box *);
 static struct eqn_box  *eqn_box_makebinary(struct eqn_node *,
                                struct eqn_box *);
@@ -469,6 +475,8 @@ eqn_next(struct eqn_node *ep, enum parse_mode mode)
 void
 eqn_box_free(struct eqn_box *bp)
 {
+       if (bp == NULL)
+               return;
 
        if (bp->first)
                eqn_box_free(bp->first);
@@ -1093,6 +1101,9 @@ eqn_free(struct eqn_node *p)
 {
        int              i;
 
+       if (p == NULL)
+               return;
+
        for (i = 0; i < (int)p->defsz; i++) {
                free(p->defs[i].key);
                free(p->defs[i].val);