Clean up eqn(7) error handling:

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index d91fe64f8563156fdd57fc690c3fb5f238ac5627..6c2f0be8ec59d1c3ed3337dc54c6ae8dd4abbf5c 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.229 2014/11/19 03:08:17 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.234 2015/01/15 04:26:40 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -89,8 +89,7 @@ static        void              mdoc_free1(struct mdoc *);
 static void              mdoc_alloc1(struct mdoc *);
 static struct mdoc_node *node_alloc(struct mdoc *, int, int,
                                enum mdoct, enum mdoc_type);
-static int               node_append(struct mdoc *,
-                               struct mdoc_node *);
+static void              node_append(struct mdoc *, struct mdoc_node *);
 static int               mdoc_ptext(struct mdoc *, int, char *, int);
 static int               mdoc_pmacro(struct mdoc *, int, char *, int);
 
@@ -191,14 +190,14 @@ mdoc_alloc(struct roff *roff, struct mparse *parse,
        return(p);
 }
 
-int
+void
 mdoc_endparse(struct mdoc *mdoc)
 {
 
-       return(mdoc_macroend(mdoc));
+       mdoc_macroend(mdoc);
 }
 
-int
+void
 mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep)
 {
        struct mdoc_node *n;
@@ -207,27 +206,19 @@ mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep)
        n->eqn = ep;
        if (ep->ln > mdoc->last->line)
                n->flags |= MDOC_LINE;
-
-       if ( ! node_append(mdoc, n))
-               return(0);
-
+       node_append(mdoc, n);
        mdoc->next = MDOC_NEXT_SIBLING;
-       return(1);
 }
 
-int
+void
 mdoc_addspan(struct mdoc *mdoc, const struct tbl_span *sp)
 {
        struct mdoc_node *n;
 
        n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, MDOC_TBL);
        n->span = sp;
-
-       if ( ! node_append(mdoc, n))
-               return(0);
-
+       node_append(mdoc, n);
        mdoc->next = MDOC_NEXT_SIBLING;
-       return(1);
 }
 
 /*
@@ -257,7 +248,7 @@ mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs)
            mdoc_ptext(mdoc, ln, buf, offs));
 }
 
-int
+void
 mdoc_macro(MACRO_PROT_ARGS)
 {
        assert(tok < MDOC_MAX);
@@ -267,7 +258,7 @@ mdoc_macro(MACRO_PROT_ARGS)
                        mandoc_vmsg(MANDOCERR_DT_LATE,
                            mdoc->parse, line, ppos,
                            "Dt %s", buf + *pos);
-                       return(1);
+                       return;
                }
        } else if ( ! (mdoc_macros[tok].flags & MDOC_PROLOGUE)) {
                if (mdoc->meta.title == NULL) {
@@ -280,12 +271,11 @@ mdoc_macro(MACRO_PROT_ARGS)
                        mdoc->meta.vol = mandoc_strdup("LOCAL");
                mdoc->flags |= MDOC_PBODY;
        }
-
-       return((*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf));
+       (*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf);
 }
 
 
-static int
+static void
 node_append(struct mdoc *mdoc, struct mdoc_node *p)
 {
 
@@ -329,8 +319,7 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
                break;
        }
 
-       if ( ! mdoc_valid_pre(mdoc, p))
-               return(0);
+       mdoc_valid_pre(mdoc, p);
 
        switch (p->type) {
        case MDOC_HEAD:
@@ -357,14 +346,11 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
        case MDOC_TBL:
                /* FALLTHROUGH */
        case MDOC_TEXT:
-               if ( ! mdoc_valid_post(mdoc))
-                       return(0);
+               mdoc_valid_post(mdoc);
                break;
        default:
                break;
        }
-
-       return(1);
 }
 
 static struct mdoc_node *
@@ -394,46 +380,41 @@ node_alloc(struct mdoc *mdoc, int line, int pos,
        return(p);
 }
 
-int
+void
 mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
 {
        struct mdoc_node *p;
 
        p = node_alloc(mdoc, line, pos, tok, MDOC_TAIL);
-       if ( ! node_append(mdoc, p))
-               return(0);
+       node_append(mdoc, p);
        mdoc->next = MDOC_NEXT_CHILD;
-       return(1);
 }
 
-int
+struct mdoc_node *
 mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
 {
        struct mdoc_node *p;
 
        assert(mdoc->first);
        assert(mdoc->last);
-
        p = node_alloc(mdoc, line, pos, tok, MDOC_HEAD);
-       if ( ! node_append(mdoc, p))
-               return(0);
+       node_append(mdoc, p);
        mdoc->next = MDOC_NEXT_CHILD;
-       return(1);
+       return(p);
 }
 
-int
+struct mdoc_node *
 mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok)
 {
        struct mdoc_node *p;
 
        p = node_alloc(mdoc, line, pos, tok, MDOC_BODY);
-       if ( ! node_append(mdoc, p))
-               return(0);
+       node_append(mdoc, p);
        mdoc->next = MDOC_NEXT_CHILD;
-       return(1);
+       return(p);
 }
 
-int
+void
 mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok,
                struct mdoc_node *body, enum mdoc_endbody end)
 {
@@ -443,13 +424,11 @@ mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok,
        p->pending = body;
        p->norm = body->norm;
        p->end = end;
-       if ( ! node_append(mdoc, p))
-               return(0);
+       node_append(mdoc, p);
        mdoc->next = MDOC_NEXT_SIBLING;
-       return(1);
 }
 
-int
+struct mdoc_node *
 mdoc_block_alloc(struct mdoc *mdoc, int line, int pos,
                enum mdoct tok, struct mdoc_arg *args)
 {
@@ -475,14 +454,12 @@ mdoc_block_alloc(struct mdoc *mdoc, int line, int pos,
        default:
                break;
        }
-
-       if ( ! node_append(mdoc, p))
-               return(0);
+       node_append(mdoc, p);
        mdoc->next = MDOC_NEXT_CHILD;
-       return(1);
+       return(p);
 }
 
-int
+void
 mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos,
                enum mdoct tok, struct mdoc_arg *args)
 {
@@ -500,26 +477,19 @@ mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos,
        default:
                break;
        }
-
-       if ( ! node_append(mdoc, p))
-               return(0);
+       node_append(mdoc, p);
        mdoc->next = MDOC_NEXT_CHILD;
-       return(1);
 }
 
-int
+void
 mdoc_word_alloc(struct mdoc *mdoc, int line, int pos, const char *p)
 {
        struct mdoc_node *n;
 
        n = node_alloc(mdoc, line, pos, MDOC_MAX, MDOC_TEXT);
        n->string = roff_strdup(mdoc->roff, p);
-
-       if ( ! node_append(mdoc, n))
-               return(0);
-
+       node_append(mdoc, n);
        mdoc->next = MDOC_NEXT_SIBLING;
-       return(1);
 }
 
 void
@@ -601,12 +571,12 @@ mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node *p)
        mdoc_node_free(p);
 }
 
-int
+void
 mdoc_node_relink(struct mdoc *mdoc, struct mdoc_node *p)
 {
 
        mdoc_node_unlink(mdoc, p);
-       return(node_append(mdoc, p));
+       node_append(mdoc, p);
 }
 
 /*
@@ -633,7 +603,8 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs)
            LIST_column == n->norm->Bl.type) {
                /* `Bl' is open without any children. */
                mdoc->flags |= MDOC_FREECOL;
-               return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf));
+               mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf);
+               return(1);
        }
 
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
@@ -642,7 +613,8 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs)
            LIST_column == n->parent->norm->Bl.type) {
                /* `Bl' has block-level `It' children. */
                mdoc->flags |= MDOC_FREECOL;
-               return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf));
+               mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf);
+               return(1);
        }
 
        /*
@@ -690,7 +662,7 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs)
                mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
                    line, (int)(ws-buf), NULL);
 
-       if ('\0' == buf[offs] && ! (MDOC_LITERAL & mdoc->flags)) {
+       if (buf[offs] == '\0' && ! (mdoc->flags & MDOC_LITERAL)) {
                mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse,
                    line, (int)(c - buf), NULL);
 
@@ -699,18 +671,15 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs)
                 * blank lines aren't allowed, but enough manuals assume this
                 * behaviour that we want to work around it.
                 */
-               if ( ! mdoc_elem_alloc(mdoc, line, offs, MDOC_sp, NULL))
-                       return(0);
-
+               mdoc_elem_alloc(mdoc, line, offs, MDOC_sp, NULL);
                mdoc->next = MDOC_NEXT_SIBLING;
-
-               return(mdoc_valid_post(mdoc));
+               mdoc_valid_post(mdoc);
+               return(1);
        }
 
-       if ( ! mdoc_word_alloc(mdoc, line, offs, buf+offs))
-               return(0);
+       mdoc_word_alloc(mdoc, line, offs, buf+offs);
 
-       if (MDOC_LITERAL & mdoc->flags)
+       if (mdoc->flags & MDOC_LITERAL)
                return(1);
 
        /*
@@ -723,7 +692,6 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs)
 
        if (mandoc_eos(buf+offs, (size_t)(end-buf-offs)))
                mdoc->last->flags |= MDOC_EOS;
-
        return(1);
 }
 
@@ -795,8 +763,10 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
         * into macro processing.
         */
 
-       if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok)
-               return(mdoc_macro(mdoc, tok, ln, sv, &offs, buf));
+       if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) {
+               mdoc_macro(mdoc, tok, ln, sv, &offs, buf);
+               return(1);
+       }
 
        n = mdoc->last;
        assert(mdoc->last);
@@ -809,7 +779,8 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
            LIST_column == n->norm->Bl.type) {
                mdoc->flags |= MDOC_FREECOL;
-               return(mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf));
+               mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf);
+               return(1);
        }
 
        /*
@@ -823,13 +794,13 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
            MDOC_Bl == n->parent->tok &&
            LIST_column == n->parent->norm->Bl.type) {
                mdoc->flags |= MDOC_FREECOL;
-               return(mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf));
+               mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf);
+               return(1);
        }
 
        /* Normal processing of a macro. */
 
-       if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf))
-               return(0);
+       mdoc_macro(mdoc, tok, ln, sv, &offs, buf);
 
        /* In quick mode (for mandocdb), abort after the NAME section. */