=================================================================== RCS file: /cvs/docbook2mdoc/macro.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- docbook2mdoc/macro.c 2019/04/07 15:06:56 1.7 +++ docbook2mdoc/macro.c 2019/04/10 14:22:37 1.8 @@ -1,4 +1,4 @@ -/* $Id: macro.c,v 1.7 2019/04/07 15:06:56 schwarze Exp $ */ +/* $Id: macro.c,v 1.8 2019/04/10 14:22:37 schwarze Exp $ */ /* * Copyright (c) 2019 Ingo Schwarze * @@ -203,7 +203,7 @@ macro_argline(struct format *f, const char *name, cons * Recursively append text from the children of a node to a macro line. */ void -macro_addnode(struct format *f, struct pnode *pn, int flags) +macro_addnode(struct format *f, struct pnode *n, int flags) { struct pnode *nc; int quote_now; @@ -215,12 +215,12 @@ macro_addnode(struct format *f, struct pnode *pn, int * that text, letting macro_addarg() decide about quoting. */ - while ((nc = TAILQ_FIRST(&pn->childq)) != NULL && + while ((nc = TAILQ_FIRST(&n->childq)) != NULL && TAILQ_NEXT(nc, child) == NULL) - pn = nc; + n = nc; - if (pn->node == NODE_TEXT || pn->node == NODE_ESCAPE) { - macro_addarg(f, pn->b, flags); + if (n->node == NODE_TEXT || n->node == NODE_ESCAPE) { + macro_addarg(f, n->b, flags); return; } @@ -258,10 +258,10 @@ macro_addnode(struct format *f, struct pnode *pn, int } void -macro_nodeline(struct format *f, const char *name, struct pnode *pn, int flags) +macro_nodeline(struct format *f, const char *name, struct pnode *n, int flags) { macro_open(f, name); - macro_addnode(f, pn, ARG_SPACE | flags); + macro_addnode(f, n, ARG_SPACE | flags); macro_close(f); }