=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.105 retrieving revision 1.112 diff -u -p -r1.105 -r1.112 --- mandoc/mdoc.c 2009/09/16 14:40:56 1.105 +++ mandoc/mdoc.c 2009/10/27 08:26:12 1.112 @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.105 2009/09/16 14:40:56 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.112 2009/10/27 08:26:12 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -14,6 +14,8 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include + #include #include #include @@ -74,7 +76,9 @@ const char *const __mdoc_merrnames[MERRMAX] = { "unclosed explicit scope", /* EOPEN */ "unterminated quoted phrase", /* EQUOTPHR */ "closure macro without prior context", /* ENOCTX */ - "no description found for library" /* ELIB */ + "no description found for library", /* ELIB */ + "bad child for parent context", /* EBADCHILD */ + "list arguments preceding type", /* ENOTYPE */ }; const char *const __mdoc_macronames[MDOC_MAX] = { @@ -112,7 +116,9 @@ const char *const __mdoc_macronames[MDOC_MAX] = { /* LINTED */ "Brc", "\%C", "Es", "En", /* LINTED */ - "Dx", "\%Q", "br", "sp" + "Dx", "\%Q", "br", "sp", + /* LINTED */ + "\%U" }; const char *const __mdoc_argnames[MDOC_ARG_MAX] = { @@ -124,7 +130,7 @@ const char *const __mdoc_argnames[MDOC_ARG_MAX] = { "ohang", "inset", "column", "width", "compact", "std", "filled", "words", "emphasis", - "symbolic", "nested" + "symbolic", "nested", "centered" }; const char * const *mdoc_macronames = __mdoc_macronames; @@ -192,7 +198,7 @@ static int mdoc_alloc1(struct mdoc *mdoc) { - bzero(&mdoc->meta, sizeof(struct mdoc_meta)); + memset(&mdoc->meta, 0, sizeof(struct mdoc_meta)); mdoc->flags = 0; mdoc->lastnamed = mdoc->lastsec = SEC_NONE; mdoc->last = calloc(1, sizeof(struct mdoc_node)); @@ -656,7 +662,6 @@ parsetext(struct mdoc *m, int line, char *buf) m->next = MDOC_NEXT_SIBLING; return(1); } -