From 71ddcd873082a3c68ed2be7b7661075fb09d5849 Mon Sep 17 00:00:00 2001
From: Kristaps Dzonsons <kristaps@bsd.lv>
Date: Sun, 20 Mar 2011 16:02:05 +0000
Subject: Consolidate messages.  Have all parse-time messages (in libmdoc,
 libroff, etc., etc.) route into mandoc_msg() and mandoc_vmsg(), for the time
 being in libmandoc.h.  This requires struct mparse to be passed into the
 allocation routines instead of mandocmsg and a void pointer. Then, move some
 of the functionality of the old mmsg() into read.c's mparse_mmsg() (check
 against wlevel and setting of file_status) and use main.c's mmsg() as simply
 a printing tool.

---
 mdoc_validate.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'mdoc_validate.c')

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 7c936ce5..a2099594 100644
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.163 2011/03/17 12:14:19 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.164 2011/03/20 16:02:05 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -446,7 +446,7 @@ check_count(struct mdoc *m, enum mdoc_type type,
 	}
 
 	t = lvl == CHECK_WARN ? MANDOCERR_ARGCWARN : MANDOCERR_ARGCOUNT;
-	mdoc_vmsg(m, t, m->last->line, m->last->pos,
+	mandoc_vmsg(t, m->parse, m->last->line, m->last->pos,
 			"want %s%d children (have %d)",
 			p, val, m->last->nchild);
 	return(1);
@@ -581,10 +581,9 @@ check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t)
 			(t == n->parent->type))
 		return(1);
 
-	mdoc_vmsg(mdoc, MANDOCERR_SYNTCHILD,
-				n->line, n->pos, "want parent %s",
-				MDOC_ROOT == t ? "<root>" : 
-					mdoc_macronames[tok]);
+	mandoc_vmsg(MANDOCERR_SYNTCHILD, mdoc->parse, n->line, 
+			n->pos, "want parent %s", MDOC_ROOT == t ? 
+			"<root>" : mdoc_macronames[tok]);
 	return(0);
 }
 
@@ -1332,7 +1331,8 @@ post_it(POST_ARGS)
 		else
 			er = MANDOCERR_SYNTARGCOUNT;
 
-		mdoc_vmsg(mdoc, er, mdoc->last->line, mdoc->last->pos, 
+		mandoc_vmsg(er, mdoc->parse, mdoc->last->line, 
+				mdoc->last->pos, 
 				"columns == %d (have %d)", cols, i);
 		return(MANDOCERR_ARGCOUNT == er);
 	default:
@@ -2001,16 +2001,16 @@ post_dd(POST_ARGS)
 
 	n = mdoc->last;
 	if (NULL == n->child || '\0' == n->child->string[0]) {
-		mdoc->meta.date = mandoc_normdate(NULL,
-		    mdoc->msg, mdoc->data, n->line, n->pos);
+		mdoc->meta.date = mandoc_normdate
+			(mdoc->parse, NULL, n->line, n->pos);
 		return(1);
 	}
 
 	if ( ! concat(mdoc, buf, n->child, DATESIZE))
 		return(0);
 
-	mdoc->meta.date = mandoc_normdate(buf,
-	    mdoc->msg, mdoc->data, n->line, n->pos);
+	mdoc->meta.date = mandoc_normdate
+		(mdoc->parse, buf, n->line, n->pos);
 
 	return(1);
 }
-- 
cgit v1.2.3