=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.44 retrieving revision 1.46 diff -u -p -r1.44 -r1.46 --- mandoc/mdoc.c 2009/01/21 11:35:26 1.44 +++ mandoc/mdoc.c 2009/02/22 14:31:08 1.46 @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.44 2009/01/21 11:35:26 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.46 2009/02/22 14:31:08 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -212,12 +212,14 @@ static void argfree(size_t, struct mdoc_arg *); static void argcpy(struct mdoc_arg *, const struct mdoc_arg *); +static struct mdoc_node *mdoc_node_alloc(const struct mdoc *); static int mdoc_node_append(struct mdoc *, struct mdoc_node *); static void mdoc_elem_free(struct mdoc_elem *); static void mdoc_text_free(struct mdoc_text *); + const struct mdoc_node * mdoc_node(struct mdoc *mdoc) { @@ -510,6 +512,18 @@ mdoc_node_append(struct mdoc *mdoc, struct mdoc_node * } +static struct mdoc_node * +mdoc_node_alloc(const struct mdoc *mdoc) +{ + struct mdoc_node *p; + + p = xcalloc(1, sizeof(struct mdoc_node)); + p->sec = mdoc->lastsec; + + return(p); +} + + int mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, int tok) { @@ -518,7 +532,7 @@ mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, assert(mdoc->first); assert(mdoc->last); - p = xcalloc(1, sizeof(struct mdoc_node)); + p = mdoc_node_alloc(mdoc); p->line = line; p->pos = pos; @@ -537,7 +551,7 @@ mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, assert(mdoc->first); assert(mdoc->last); - p = xcalloc(1, sizeof(struct mdoc_node)); + p = mdoc_node_alloc(mdoc); p->line = line; p->pos = pos; @@ -556,7 +570,7 @@ mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, assert(mdoc->first); assert(mdoc->last); - p = xcalloc(1, sizeof(struct mdoc_node)); + p = mdoc_node_alloc(mdoc); p->line = line; p->pos = pos; @@ -572,7 +586,7 @@ mdoc_root_alloc(struct mdoc *mdoc) { struct mdoc_node *p; - p = xcalloc(1, sizeof(struct mdoc_node)); + p = mdoc_node_alloc(mdoc); p->type = MDOC_ROOT; @@ -586,7 +600,7 @@ mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, { struct mdoc_node *p; - p = xcalloc(1, sizeof(struct mdoc_node)); + p = mdoc_node_alloc(mdoc); p->pos = pos; p->line = line; @@ -605,7 +619,7 @@ mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, { struct mdoc_node *p; - p = xcalloc(1, sizeof(struct mdoc_node)); + p = mdoc_node_alloc(mdoc); p->line = line; p->pos = pos; @@ -624,7 +638,8 @@ mdoc_word_alloc(struct mdoc *mdoc, { struct mdoc_node *p; - p = xcalloc(1, sizeof(struct mdoc_node)); + p = mdoc_node_alloc(mdoc); + p->line = line; p->pos = pos; p->type = MDOC_TEXT;