Do not dereference a NULL pointer if a .Bl macro has

[mandoc.git] / libmdoc.h

diff --git a/libmdoc.h b/libmdoc.h
index 3f14519d3b404358bd1c87e2f0475042b120e6c4..1507a8c26fbb9104f6699e3bb57512852df9ece2 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmdoc.h,v 1.82 2013/10/21 23:47:58 schwarze Exp $ */
+/*     $Id: libmdoc.h,v 1.88 2014/08/01 17:40:34 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -25,9 +25,9 @@ enum  mdoc_next {
 
 struct mdoc {
        struct mparse    *parse; /* parse pointer */
-       char             *defos; /* default argument for .Os */
+       const char       *defos; /* default argument for .Os */
+       int               quick; /* abort parse early */
        int               flags; /* parse flags */
-#define        MDOC_HALT        (1 << 0) /* error in parse: halt */
 #define        MDOC_LITERAL     (1 << 1) /* in a literal scope */
 #define        MDOC_PBODY       (1 << 2) /* in the document body */
 #define        MDOC_NEWLINE     (1 << 3) /* first macro/text in a line */
@@ -40,6 +40,7 @@ struct        mdoc {
        enum mdoc_next    next; /* where to put the next node */
        struct mdoc_node *last; /* the last node parsed */
        struct mdoc_node *first; /* the first node parsed */
+       struct mdoc_node *last_es; /* the most recent Es node */
        struct mdoc_meta  meta; /* document meta-data */
        enum mdoc_sec     lastnamed;
        enum mdoc_sec     lastsec;
@@ -103,17 +104,13 @@ extern    const struct mdoc_macro *const mdoc_macros;
 
 __BEGIN_DECLS
 
-#define                  mdoc_pmsg(mdoc, l, p, t) \
-                 mandoc_msg((t), (mdoc)->parse, (l), (p), NULL)
-#define                  mdoc_nmsg(mdoc, n, t) \
-                 mandoc_msg((t), (mdoc)->parse, (n)->line, (n)->pos, NULL)
 int              mdoc_macro(MACRO_PROT_ARGS);
-int              mdoc_word_alloc(struct mdoc *, 
+int              mdoc_word_alloc(struct mdoc *,
                        int, int, const char *);
 void             mdoc_word_append(struct mdoc *, const char *);
-int              mdoc_elem_alloc(struct mdoc *, int, int, 
+int              mdoc_elem_alloc(struct mdoc *, int, int,
                        enum mdoct, struct mdoc_arg *);
-int              mdoc_block_alloc(struct mdoc *, int, int, 
+int              mdoc_block_alloc(struct mdoc *, int, int,
                        enum mdoct, struct mdoc_arg *);
 int              mdoc_head_alloc(struct mdoc *, int, int, enum mdoct);
 int              mdoc_tail_alloc(struct mdoc *, int, int, enum mdoct);
@@ -136,7 +133,7 @@ enum margverr         mdoc_argv(struct mdoc *, int, enum mdoct,
 void             mdoc_argv_free(struct mdoc_arg *);
 enum margserr    mdoc_args(struct mdoc *, int,
                        int *, char *, enum mdoct, char **);
-enum margserr    mdoc_zargs(struct mdoc *, int, 
+enum margserr    mdoc_zargs(struct mdoc *, int,
                        int *, char *, char **);
 int              mdoc_macroend(struct mdoc *);
 enum mdelim      mdoc_isdelim(const char *);