catch up with the changed interface of mparse_alloc(), see mandoc.h rev 1.100

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index cdeb88bfb62fe1fa178240ff0ad349bd0947be5b..ee7c36ddd4288690b2b33fb804f81ced7e174e0d 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.193 2011/07/27 12:41:02 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.197 2012/05/27 17:48:57 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -160,6 +160,7 @@ mdoc_alloc1(struct mdoc *mdoc)
        mdoc->last = mandoc_calloc(1, sizeof(struct mdoc_node));
        mdoc->first = mdoc->last;
        mdoc->last->type = MDOC_ROOT;
+       mdoc->last->tok = MDOC_MAX;
        mdoc->next = MDOC_NEXT_CHILD;
 }
 
@@ -196,13 +197,14 @@ mdoc_free(struct mdoc *mdoc)
  * Allocate volatile and non-volatile parse resources.  
  */
 struct mdoc *
-mdoc_alloc(struct roff *roff, struct mparse *parse)
+mdoc_alloc(struct roff *roff, struct mparse *parse, char *defos)
 {
        struct mdoc     *p;
 
        p = mandoc_calloc(1, sizeof(struct mdoc));
 
        p->parse = parse;
+       p->defos = defos;
        p->roff = roff;
 
        mdoc_hash_init();
@@ -568,16 +570,9 @@ int
 mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)
 {
        struct mdoc_node *n;
-       size_t            sv, len;
-
-       len = strlen(p);
 
        n = node_alloc(m, line, pos, MDOC_MAX, MDOC_TEXT);
-       n->string = mandoc_malloc(len + 1);
-       sv = strlcpy(n->string, p, len + 1);
-
-       /* Prohibit truncation. */
-       assert(sv < len + 1);
+       n->string = roff_strdup(m->roff, p);
 
        if ( ! node_append(m, n))
                return(0);