As suggested by jmc@, only include line and column numbers into messages

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 6e8ef19b7e577f8d09ec53f01b1b8fc2284224f7..bb7025b91045cc6f8a1a3ef648f38f893aa1b42c 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_validate.c,v 1.215 2014/06/20 17:24:00 schwarze Exp $ */
+/*     $Id: mdoc_validate.c,v 1.216 2014/06/20 23:02:31 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -1645,15 +1645,15 @@ ebool(struct mdoc *mdoc)
 static int
 post_root(POST_ARGS)
 {
-       int               erc;
+       int               ret;
        struct mdoc_node *n;
 
-       erc = 0;
+       ret = 1;
 
        /* Check that we have a finished prologue. */
 
        if ( ! (MDOC_PBODY & mdoc->flags)) {
-               erc++;
+               ret = 0;
                mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCPROLOG);
        }
 
@@ -1662,17 +1662,13 @@ post_root(POST_ARGS)
 
        /* Check that we begin with a proper `Sh'. */
 
-       if (NULL == n->child) {
-               erc++;
-               mdoc_nmsg(mdoc, n, MANDOCERR_NODOCBODY);
-       } else if (MDOC_BLOCK != n->child->type ||
-           MDOC_Sh != n->child->tok) {
-               erc++;
-               /* Can this be lifted?  See rxdebug.1 for example. */
-               mdoc_nmsg(mdoc, n, MANDOCERR_NODOCBODY);
-       }
+       if (NULL == n->child)
+               mdoc_nmsg(mdoc, n, MANDOCERR_DOC_EMPTY);
+       else if (MDOC_BLOCK != n->child->type ||
+           MDOC_Sh != n->child->tok)
+               mdoc_nmsg(mdoc, n->child, MANDOCERR_SEC_BEFORE);
 
-       return(erc ? 0 : 1);
+       return(ret);
 }
 
 static int