Clean up {mdoc,man}_pmsg and vmsg invocations (ignore return values).

2 files changed, 22 insertions, 20 deletions

diff --git a/man.c b/man.c
index d8b478de..a8c097ec 100644
--- a/man.c
+++ b/man.c
@@ -348,8 +348,10 @@ man_ptext(struct man *m, int line, char *buf, int offs)
 
 	if ('\\' == buf[offs] && 
 			'.' == buf[offs + 1] && 
-			'"' == buf[offs + 2])
-		return(man_pmsg(m, line, offs, MANDOCERR_BADCOMMENT));
+			'"' == buf[offs + 2]) {
+		man_pmsg(m, line, offs, MANDOCERR_BADCOMMENT);
+		return(1);
+	}
 
 	/* Literal free-form text whitespace is preserved. */
 
@@ -381,8 +383,7 @@ man_ptext(struct man *m, int line, char *buf, int offs)
 
 	if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
 		if (i > 1 && '\\' != buf[i - 2])
-			if ( ! man_pmsg(m, line, i - 1, MANDOCERR_EOLNSPACE))
-				return(0);
+			man_pmsg(m, line, i - 1, MANDOCERR_EOLNSPACE);
 
 		for (--i; i && ' ' == buf[i]; i--)
 			/* Spin back to non-space. */ ;
@@ -488,8 +489,7 @@ man_pmacro(struct man *m, int ln, char *buf, int offs)
 	 */
 
 	if ('\0' == buf[i] && ' ' == buf[i - 1])
-		if ( ! man_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE))
-			goto err;
+		man_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE);
 
 	/* 
 	 * Remove prior ELINE macro, as it's being clobbered by a new
diff --git a/mdoc.c b/mdoc.c
index 497f19e6..92615c5d 100644
--- a/mdoc.c
+++ b/mdoc.c
@@ -277,15 +277,16 @@ mdoc_macro(MACRO_PROT_ARGS)
 	/* If we're in the body, deny prologue calls. */
 
 	if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
-			MDOC_PBODY & m->flags)
-		return(mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY));
+			MDOC_PBODY & m->flags) {
+		mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY);
+		return(1);
+	}
 
 	/* If we're in the prologue, deny "body" macros.  */
 
 	if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
 			! (MDOC_PBODY & m->flags)) {
-		if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG))
-			return(0);
+		mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG);
 		if (NULL == m->meta.msec)
 			m->meta.msec = mandoc_strdup("1");
 		if (NULL == m->meta.title)
@@ -629,13 +630,17 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
 
 	if ('\\' == buf[offs] && 
 			'.' == buf[offs + 1] && 
-			'"' == buf[offs + 2])
-		return(mdoc_pmsg(m, line, offs, MANDOCERR_BADCOMMENT));
+			'"' == buf[offs + 2]) {
+		mdoc_pmsg(m, line, offs, MANDOCERR_BADCOMMENT);
+		return(1);
+	}
 
 	/* No text before an initial macro. */
 
-	if (SEC_NONE == m->lastnamed)
-		return(mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT));
+	if (SEC_NONE == m->lastnamed) {
+		mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT);
+		return(1);
+	}
 
 	assert(m->last);
 	n = m->last;
@@ -710,12 +715,10 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
 	*end = '\0';
 
 	if (ws)
-		if ( ! mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE))
-			return(0);
+		mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE);
 
 	if ('\0' == buf[offs] && ! (MDOC_LITERAL & m->flags)) {
-		if ( ! mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN))
-			return(0);
+		mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN);
 
 		/*
 		 * Insert a `sp' in the case of a blank line.  Technically,
@@ -815,8 +818,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
 	 */
 
 	if ('\0' == buf[i] && ' ' == buf[i - 1])
-		if ( ! mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE))
-			goto err;
+		mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE);
 
 	/*
 	 * If an initial macro or a list invocation, divert directly