=================================================================== RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v retrieving revision 1.46 retrieving revision 1.48 diff -u -p -r1.46 -r1.48 --- docbook2mdoc/docbook2mdoc.c 2019/03/08 15:09:54 1.46 +++ docbook2mdoc/docbook2mdoc.c 2019/03/22 15:38:09 1.48 @@ -1,4 +1,4 @@ -/* $Id: docbook2mdoc.c,v 1.46 2019/03/08 15:09:54 schwarze Exp $ */ +/* $Id: docbook2mdoc.c,v 1.48 2019/03/22 15:38:09 schwarze Exp $ */ /* * Copyright (c) 2014 Kristaps Dzonsons * @@ -41,7 +41,7 @@ struct parse { unsigned int flags; /* document-wide flags */ struct pnode *root; /* root of parse tree */ struct pnode *cur; /* current node in tree */ - char *b; /* nil-terminated buffer for pre-print */ + char *b; /* NUL-terminated buffer for pre-print */ size_t bsz; /* current length of b */ size_t mbsz; /* max bsz allocation */ int newln; /* output: are we on a fresh line */ @@ -327,20 +327,8 @@ xml_elem_start(void *arg, const XML_Char *name, const XML_GetCurrentColumnNumber(ps->xml)); ps->stop = 1; return; - } else if (NODE_ROOT == ps->node && NODE_REFENTRY != node) { + } else if (NODE_ROOT == ps->node && NODE_REFENTRY != node) return; - } else if ( ! isparent(node, ps->node)) { - fprintf(stderr, "%s:%zu:%zu: bad parent \"%s\" " - "of node \"%s\"\n", - ps->fname, XML_GetCurrentLineNumber(ps->xml), - XML_GetCurrentColumnNumber(ps->xml), - NULL == nodes[ps->node].name ? - "(none)" : nodes[ps->node].name, - NULL == nodes[node].name ? - "(none)" : nodes[node].name); - ps->stop = 1; - return; - } if (NODE_INLINEEQUATION == node) ps->flags |= PARSE_EQN; @@ -505,7 +493,7 @@ bufclear(struct parse *p) /* * Append NODE_TEXT contents to the current buffer, reallocating its * size if necessary. - * The buffer is ALWAYS nil-terminated. + * The buffer is ALWAYS NUL-terminated. */ static void bufappend(struct parse *p, struct pnode *pn)