=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/roff_validate.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- src/usr.bin/mandoc/roff_validate.c 2018/12/14 01:17:46 1.13 +++ src/usr.bin/mandoc/roff_validate.c 2018/12/14 05:17:45 1.14 @@ -1,4 +1,4 @@ -/* $OpenBSD: roff_validate.c,v 1.13 2018/12/14 01:17:46 schwarze Exp $ */ +/* $OpenBSD: roff_validate.c,v 1.14 2018/12/14 05:17:45 schwarze Exp $ */ /* * Copyright (c) 2010, 2017, 2018 Ingo Schwarze * @@ -64,12 +64,12 @@ struct roff_node *np; if (n->child != NULL) - mandoc_vmsg(MANDOCERR_ARG_SKIP, man->parse, + mandoc_msg(MANDOCERR_ARG_SKIP, n->line, n->pos, "br %s", n->child->string); if (n->next != NULL && n->next->type == ROFFT_TEXT && *n->next->string == ' ') { - mandoc_msg(MANDOCERR_PAR_SKIP, man->parse, n->line, n->pos, + mandoc_msg(MANDOCERR_PAR_SKIP, n->line, n->pos, "br before text line with leading blank"); roff_node_delete(man, n); return; @@ -82,7 +82,7 @@ case ROFF_br: case ROFF_sp: case MDOC_Pp: - mandoc_vmsg(MANDOCERR_PAR_SKIP, man->parse, + mandoc_msg(MANDOCERR_PAR_SKIP, n->line, n->pos, "br after %s", roff_name[np->tok]); roff_node_delete(man, n); break; @@ -128,8 +128,7 @@ break; } - mandoc_vmsg(MANDOCERR_FT_BAD, man->parse, - n->line, n->pos, "ft %s", cp); + mandoc_msg(MANDOCERR_FT_BAD, n->line, n->pos, "ft %s", cp); roff_node_delete(man, n); } @@ -139,7 +138,7 @@ struct roff_node *np; if (n->child != NULL && n->child->next != NULL) - mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse, + mandoc_msg(MANDOCERR_ARG_EXCESS, n->child->next->line, n->child->next->pos, "sp ... %s", n->child->next->string); @@ -148,12 +147,12 @@ switch (np->tok) { case ROFF_br: - mandoc_msg(MANDOCERR_PAR_SKIP, man->parse, + mandoc_msg(MANDOCERR_PAR_SKIP, np->line, np->pos, "br before sp"); roff_node_delete(man, np); break; case MDOC_Pp: - mandoc_msg(MANDOCERR_PAR_SKIP, man->parse, + mandoc_msg(MANDOCERR_PAR_SKIP, n->line, n->pos, "sp after Pp"); roff_node_delete(man, n); break;