From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from krisdoz.my.domain (kristaps@localhost [127.0.0.1])
	by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id oB5Ft2Ra027529
	for <source@mdocml.bsd.lv>; Sun, 5 Dec 2010 10:55:02 -0500 (EST)
Received: (from kristaps@localhost)
	by krisdoz.my.domain (8.14.3/8.14.3/Submit) id oB5Ft1tO014204;
	Sun, 5 Dec 2010 10:55:01 -0500 (EST)
Date: Sun, 5 Dec 2010 10:55:01 -0500 (EST)
Message-Id: <201012051555.oB5Ft1tO014204@krisdoz.my.domain>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: kristaps@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Remove long-standing FIXME regarding the consolidation of 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
Remove long-standing FIXME regarding the consolidation of WIDTHARG and
NOARGV warnings.  From patch by schwarze@.

Modified Files:
--------------
    mdocml:
        main.c
        mandoc.h
        mdoc_validate.c

Revision Data
-------------
Index: mdoc_validate.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_validate.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -Lmdoc_validate.c -Lmdoc_validate.c -u -p -r1.136 -r1.137
--- mdoc_validate.c
+++ mdoc_validate.c
@@ -753,9 +753,8 @@ pre_bl(PRE_ARGS)
 	case (LIST_inset):
 		/* FALLTHROUGH */
 	case (LIST_item):
-		if (NULL == n->data.Bl->width)
-			break;
-		mdoc_nmsg(mdoc, n, MANDOCERR_WIDTHARG);
+		if (n->data.Bl->width)
+			mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
 		break;
 	default:
 		break;
Index: mandoc.h
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mandoc.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -Lmandoc.h -Lmandoc.h -u -p -r1.28 -r1.29
--- mandoc.h
+++ mandoc.h
@@ -56,8 +56,6 @@ enum	mandocerr {
 	MANDOCERR_BADESCAPE, /* bad escape sequence */
 	MANDOCERR_BADQUOTE, /* unterminated quoted string */
 	MANDOCERR_NOWIDTHARG, /* argument requires the width argument */
-	/* FIXME: merge with MANDOCERR_IGNARGV. */
-	MANDOCERR_WIDTHARG, /* superfluous width argument */
 	MANDOCERR_BADDATE, /* bad date argument */
 	MANDOCERR_BADWIDTH, /* bad width argument */
 	MANDOCERR_BADMSEC, /* unknown manual section */
Index: main.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/main.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -Lmain.c -Lmain.c -u -p -r1.117 -r1.118
--- main.c
+++ main.c
@@ -133,7 +133,6 @@ static	const char * const	mandocerrs[MAN
 	"bad escape sequence",
 	"unterminated quoted string",
 	"argument requires the width argument",
-	"superfluous width argument",
 	"bad date argument",
 	"bad width argument",
 	"unknown manual section",
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv