From 48ef4044a299e0b5996e03ddd8f3b1c6df26796e Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Mon, 6 Jul 2009 09:21:24 +0000 Subject: Initial removal of enum mdoc_warn from mdoc warnings (unnecessary complication). --- mdoc_validate.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'mdoc_validate.c') diff --git a/mdoc_validate.c b/mdoc_validate.c index 002c6e6b..02f13051 100644 --- a/mdoc_validate.c +++ b/mdoc_validate.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_validate.c,v 1.19 2009/07/04 10:41:29 kristaps Exp $ */ +/* $Id: mdoc_validate.c,v 1.20 2009/07/06 09:21:24 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -444,30 +444,24 @@ static int pwarn(struct mdoc *m, int line, int pos, enum mwarn type) { char *p; - enum mdoc_warn c; - c = WARN_SYNTAX; p = NULL; + switch (type) { case (WBADMSEC): p = "inappropriate manual section"; - c = WARN_COMPAT; break; case (WBADSEC): p = "inappropriate document section"; - c = WARN_COMPAT; break; case (WARGVAL): p = "argument value suggested"; - c = WARN_COMPAT; break; case (WPROLREP): p = "prologue macros repeated"; - c = WARN_COMPAT; break; case (WPROLOOO): p = "prologue macros out-of-order"; - c = WARN_COMPAT; break; case (WNOWIDTH): p = "superfluous width argument"; @@ -495,7 +489,6 @@ pwarn(struct mdoc *m, int line, int pos, enum mwarn type) break; case (WWRONGMSEC): p = "document section in wrong manual section"; - c = WARN_COMPAT; break; case (WSECOOO): p = "document section out of conventional order"; @@ -510,8 +503,9 @@ pwarn(struct mdoc *m, int line, int pos, enum mwarn type) p = "NAME section contents incomplete/badly-ordered"; break; } + assert(p); - return(mdoc_pwarn(m, line, pos, c, p)); + return(mdoc_pwarn(m, line, pos, p)); } @@ -529,8 +523,8 @@ warn_count(struct mdoc *m, const char *k, int want, const char *v, int has) { - return(mdoc_warn(m, WARN_SYNTAX, - "suggests %s %s %d (has %d)", v, k, want, has)); + return(mdoc_warn(m, "suggests %s %s %d (has %d)", + v, k, want, has)); } -- cgit v1.2.3-56-ge451