diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2014-06-20 17:24:00 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-06-20 17:24:00 +0000 |
| commit | b3b89a43d7165af5fd4fe84f88cdeef6cb5ee1aa (patch) | |
| tree | 66e68d5d37c2a505037e623de69d48b21809cfd2 /man_validate.c | |
| parent | 8358cc737b994d172459eaf3401807c2b0d3811c (diff) | |
| download | mandoc-b3b89a43d7165af5fd4fe84f88cdeef6cb5ee1aa.tar.gz mandoc-b3b89a43d7165af5fd4fe84f88cdeef6cb5ee1aa.tar.zst mandoc-b3b89a43d7165af5fd4fe84f88cdeef6cb5ee1aa.zip | |
Start systematic improvements of error reporting.
So far, this covers all WARNINGs related to the prologue.
1) hierarchical naming of MANDOCERR_* constants
2) mention the macro name in messages where that adds clarity
3) add one missing MANDOCERR_DATE_MISSING msg
4) fix the wording of one message related to the man(7) prologue
Started on the plane back from Ottawa.
Diffstat (limited to 'man_validate.c')
| -rw-r--r-- | man_validate.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/man_validate.c b/man_validate.c index 5daaa460..15c34e08 100644 --- a/man_validate.c +++ b/man_validate.c @@ -1,4 +1,4 @@ -/* $Id: man_validate.c,v 1.91 2014/04/20 16:46:04 schwarze Exp $ */ +/* $Id: man_validate.c,v 1.92 2014/06/20 17:24:00 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -202,7 +202,7 @@ check_root(CHKARGS) man_nmsg(man, n, MANDOCERR_NODOCBODY); return(0); } else if (NULL == man->meta.title) { - man_nmsg(man, n, MANDOCERR_NOTITLE); + man_nmsg(man, n, MANDOCERR_TH_MISSING); /* * If a title hasn't been set, do so now (by @@ -390,6 +390,7 @@ post_IP(CHKARGS) static int post_TH(CHKARGS) { + struct man_node *nb; const char *p; free(man->meta.title); @@ -401,6 +402,8 @@ post_TH(CHKARGS) man->meta.title = man->meta.vol = man->meta.date = man->meta.msec = man->meta.source = NULL; + nb = n; + /* ->TITLE<- MSEC DATE SOURCE VOL */ n = n->child; @@ -409,7 +412,7 @@ post_TH(CHKARGS) /* Only warn about this once... */ if (isalpha((unsigned char)*p) && ! isupper((unsigned char)*p)) { - man_nmsg(man, n, MANDOCERR_UPPERCASE); + man_nmsg(man, n, MANDOCERR_TITLE_CASE); break; } } @@ -435,8 +438,10 @@ post_TH(CHKARGS) mandoc_strdup(n->string) : mandoc_normdate(man->parse, n->string, n->line, n->pos); - } else + } else { man->meta.date = mandoc_strdup(""); + man_nmsg(man, n ? n : nb, MANDOCERR_DATE_MISSING); + } /* TITLE MSEC DATE ->SOURCE<- VOL */ |