Clean up the warnings related to document structure.

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 168778177c42dca0cb4f2daf2795ac245debcc29..04e9d9724864e1881dfb1ce71e1d557f78d9e26f 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.213 2014/04/20 16:46:05 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.216 2014/07/01 22:37:15 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -35,7 +35,7 @@
 #include "libmdoc.h"
 #include "libmandoc.h"
 
-const  char *const __mdoc_macronames[MDOC_MAX] = {
+const  char *const __mdoc_macronames[MDOC_MAX + 1] = {
        "Ap",           "Dd",           "Dt",           "Os",
        "Sh",           "Ss",           "Pp",           "D1",
        "Dl",           "Bd",           "Ed",           "Bl",
@@ -66,7 +66,7 @@ const char *const __mdoc_macronames[MDOC_MAX] = {
        "Lk",           "Mt",           "Brq",          "Bro",
        "Brc",          "%C",           "Es",           "En",
        "Dx",           "%Q",           "br",           "sp",
-       "%U",           "Ta",           "ll",
+       "%U",           "Ta",           "ll",           "text",
        };
 
 const  char *const __mdoc_argnames[MDOC_ARG_MAX] = {
@@ -305,7 +305,8 @@ mdoc_macro(MACRO_PROT_ARGS)
 
        if (MDOC_PROLOGUE & mdoc_macros[tok].flags &&
            MDOC_PBODY & mdoc->flags) {
-               mdoc_pmsg(mdoc, line, ppos, MANDOCERR_BADBODY);
+               mandoc_vmsg(MANDOCERR_PROLOG_ONLY, mdoc->parse,
+                   line, ppos, "%s", mdoc_macronames[tok]);
                return(1);
        }
 
@@ -313,7 +314,8 @@ mdoc_macro(MACRO_PROT_ARGS)
 
        if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) &&
             ! (MDOC_PBODY & mdoc->flags)) {
-               mdoc_pmsg(mdoc, line, ppos, MANDOCERR_BADPROLOG);
+               mandoc_vmsg(MANDOCERR_PROLOG_BAD, mdoc->parse,
+                   line, ppos, "%s", mdoc_macronames[tok]);
                if (NULL == mdoc->meta.msec)
                        mdoc->meta.msec = mandoc_strdup("1");
                if (NULL == mdoc->meta.title)
@@ -865,7 +867,7 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
 
        mac[i] = '\0';
 
-       tok = (i > 1 || i < 4) ? mdoc_hash_find(mac) : MDOC_MAX;
+       tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : MDOC_MAX;
 
        if (MDOC_MAX == tok) {
                mandoc_vmsg(MANDOCERR_MACRO, mdoc->parse,