Remove long-standing FIXME regarding the consolidation of WIDTHARG and

NOARGV warnings.  From patch by schwarze@.

diff --git a/main.c b/main.c
index 0f6994f8db9b81cfea68f173ea2375eb323b1fc0..101ea94162b36f4e237edc3ffa7a0a10a6778805 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*     $Id: main.c,v 1.117 2010/12/05 15:49:37 kristaps Exp $ */
+/*     $Id: main.c,v 1.118 2010/12/05 15:55:01 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -133,7 +133,6 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "bad escape sequence",
        "unterminated quoted string",
        "argument requires the width argument",
-       "superfluous width argument",
        "bad date argument",
        "bad width argument",
        "unknown manual section",

diff --git a/mandoc.h b/mandoc.h
index 81ea5c5db317e88ac9809c2b42863818ddb1395f..7e84f8db25e4429c720acf33b83c32446bec239f 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.h,v 1.28 2010/12/05 15:49:37 kristaps Exp $ */
+/*     $Id: mandoc.h,v 1.29 2010/12/05 15:55:01 kristaps Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -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 */

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 91fc2bfb4314e62ace478f45709b94a8d45d6f00..e54bbd58dfc26649088b98170518172dd6742508 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_validate.c,v 1.136 2010/12/05 15:49:37 kristaps Exp $ */
+/*     $Id: mdoc_validate.c,v 1.137 2010/12/05 15:55:01 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -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;