diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2014-08-01 17:40:34 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-08-01 17:40:34 +0000 |
| commit | 604bf7765cfa3f1a7d5702f8b54d326e7aaab3a4 (patch) | |
| tree | b93f498be04b56f2897a6053343084616ee50861 | |
| parent | 85ebc4c346a67252f8e7e3a1c4326920984c01e7 (diff) | |
| download | mandoc-604bf7765cfa3f1a7d5702f8b54d326e7aaab3a4.tar.gz | |
demacrify: get rid of man_nmsg(), man_pmsg(), mdoc_nmsg(), mdoc_pmsg()
| -rw-r--r-- | libman.h | 4 | ||||
| -rw-r--r-- | libmdoc.h | 4 | ||||
| -rw-r--r-- | man_validate.c | 6 | ||||
| -rw-r--r-- | mdoc_validate.c | 6 |
4 files changed, 8 insertions, 12 deletions
@@ -59,10 +59,6 @@ extern const struct man_macro *const man_macros; __BEGIN_DECLS -#define man_pmsg(man, l, p, t) \ - mandoc_msg((t), (man)->parse, (l), (p), NULL) -#define man_nmsg(man, n, t) \ - mandoc_msg((t), (man)->parse, (n)->line, (n)->pos, NULL) int man_word_alloc(struct man *, int, int, const char *); int man_block_alloc(struct man *, int, int, enum mant); int man_head_alloc(struct man *, int, int, enum mant); @@ -104,10 +104,6 @@ extern const struct mdoc_macro *const mdoc_macros; __BEGIN_DECLS -#define mdoc_pmsg(mdoc, l, p, t) \ - mandoc_msg((t), (mdoc)->parse, (l), (p), NULL) -#define mdoc_nmsg(mdoc, n, t) \ - mandoc_msg((t), (mdoc)->parse, (n)->line, (n)->pos, NULL) int mdoc_macro(MACRO_PROT_ARGS); int mdoc_word_alloc(struct mdoc *, int, int, const char *); diff --git a/man_validate.c b/man_validate.c index 535f4006..e99ee590 100644 --- a/man_validate.c +++ b/man_validate.c @@ -191,12 +191,14 @@ check_root(CHKARGS) assert((man->flags & (MAN_BLINE | MAN_ELINE)) == 0); if (NULL == man->first->child) - man_nmsg(man, n, MANDOCERR_DOC_EMPTY); + mandoc_msg(MANDOCERR_DOC_EMPTY, man->parse, + n->line, n->pos, NULL); else man->meta.hasbody = 1; if (NULL == man->meta.title) { - man_nmsg(man, n, MANDOCERR_TH_MISSING); + mandoc_msg(MANDOCERR_TH_MISSING, man->parse, + n->line, n->pos, NULL); /* * If a title hasn't been set, do so now (by diff --git a/mdoc_validate.c b/mdoc_validate.c index 70b10b1d..6b4b1546 100644 --- a/mdoc_validate.c +++ b/mdoc_validate.c @@ -1665,7 +1665,8 @@ post_root(POST_ARGS) /* Check that we begin with a proper `Sh'. */ if (NULL == n->child) - mdoc_nmsg(mdoc, n, MANDOCERR_DOC_EMPTY); + mandoc_msg(MANDOCERR_DOC_EMPTY, mdoc->parse, + n->line, n->pos, NULL); else if (MDOC_Sh != n->child->tok) mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse, n->child->line, n->child->pos, @@ -1844,7 +1845,8 @@ post_ns(POST_ARGS) { if (MDOC_LINE & mdoc->last->flags) - mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NS_SKIP); + mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse, + mdoc->last->line, mdoc->last->pos, NULL); return(1); } |