[src/trunk]: src/usr.bin/xlint make NOSTRICT behave the same a LINTED; use th...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/71729383566e
branches:  trunk
changeset: 786201:71729383566e
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Apr 19 18:51:14 2013 +0000

description:
make NOSTRICT behave the same a LINTED; use the new format.

diffstat:

 usr.bin/xlint/lint1/decl.c |   8 ++++----
 usr.bin/xlint/lint1/scan.l |  10 +++++-----
 usr.bin/xlint/lint1/tree.c |  10 +++++-----
 usr.bin/xlint/xlint/lint.1 |   4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diffs (145 lines):

diff -r cbb826d53116 -r 71729383566e usr.bin/xlint/lint1/decl.c
--- a/usr.bin/xlint/lint1/decl.c        Fri Apr 19 18:46:50 2013 +0000
+++ b/usr.bin/xlint/lint1/decl.c        Fri Apr 19 18:51:14 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.56 2013/04/19 17:43:05 christos Exp $ */
+/* $NetBSD: decl.c,v 1.57 2013/04/19 18:51:14 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.56 2013/04/19 17:43:05 christos Exp $");
+__RCSID("$NetBSD: decl.c,v 1.57 2013/04/19 18:51:14 christos Exp $");
 #endif
 
 #include <sys/param.h>
@@ -425,7 +425,7 @@
                        return (td);
                }
                break;
-               /* LINTED (enumeration values not handled in switch) */
+               /* LINTED206: (enumeration values not handled in switch) */
        case NOTSPEC:
        case USHORT:
        case UCHAR:
@@ -2878,7 +2878,7 @@
        sym_t   *sym;
        int     mklwarn;
 
-       /* for this warnings LINTED has no effect */
+       /* for this warning LINTED has no effect */
        mklwarn = lwarn;
        lwarn = LWARN_ALL;
 
diff -r cbb826d53116 -r 71729383566e usr.bin/xlint/lint1/scan.l
--- a/usr.bin/xlint/lint1/scan.l        Fri Apr 19 18:46:50 2013 +0000
+++ b/usr.bin/xlint/lint1/scan.l        Fri Apr 19 18:51:14 2013 +0000
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: scan.l,v 1.51 2013/04/19 17:43:05 christos Exp $ */
+/* $NetBSD: scan.l,v 1.52 2013/04/19 18:51:14 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: scan.l,v 1.51 2013/04/19 17:43:05 christos Exp $");
+__RCSID("$NetBSD: scan.l,v 1.52 2013/04/19 18:51:14 christos Exp $");
 #endif
 
 #include <stdlib.h>
@@ -604,7 +604,7 @@
                        warning(252);
                }
                break;
-               /* LINTED (enumeration values not handled in switch) */
+               /* LINTED206: (enumeration values not handled in switch) */
        case STRUCT:
        case VOID:
        case LDOUBLE:
@@ -1084,7 +1084,7 @@
  *     CONSTCOND CONSTANTCOND CONSTANTCONDITION
  *     FALLTHRU FALLTHROUGH
  *     LINTLIBRARY
- *     LINTED NOSTRICT
+ *     LINTEDn NOSTRICTn
  *     LONGLONG
  *     NOTREACHED
  *     PRINTFLIKEn
@@ -1113,7 +1113,7 @@
                { "LINTLIBRARY",        0,      lintlib         },
                { "LINTED",             1,      linted          },
                { "LONGLONG",           0,      longlong        },
-               { "NOSTRICT",           0,      linted          },
+               { "NOSTRICT",           1,      linted          },
                { "NOTREACHED",         0,      notreach        },
                { "PRINTFLIKE",         1,      printflike      },
                { "PROTOLIB",           1,      protolib        },
diff -r cbb826d53116 -r 71729383566e usr.bin/xlint/lint1/tree.c
--- a/usr.bin/xlint/lint1/tree.c        Fri Apr 19 18:46:50 2013 +0000
+++ b/usr.bin/xlint/lint1/tree.c        Fri Apr 19 18:51:14 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tree.c,v 1.72 2013/03/02 21:25:12 christos Exp $       */
+/*     $NetBSD: tree.c,v 1.73 2013/04/19 18:51:14 christos Exp $       */
 
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.72 2013/03/02 21:25:12 christos Exp $");
+__RCSID("$NetBSD: tree.c,v 1.73 2013/04/19 18:51:14 christos Exp $");
 #endif
 
 #include <stdlib.h>
@@ -1039,7 +1039,7 @@
                if (!modtab[ln->tn_op].m_sideeff)
                        nulleff(ln);
                break;
-               /* LINTED (enumeration values not handled in switch) */
+               /* LINTED206: (enumeration values not handled in switch) */
        case CON:
        case CASE:
        case PUSH:
@@ -3580,7 +3580,7 @@
        case NAME:
        case STRING:
                return;
-               /* LINTED (enumeration values not handled in switch) */
+               /* LINTED206: (enumeration values not handled in switch) */
        case OR:
        case XOR:
        case NE:
@@ -3969,7 +3969,7 @@
                        }
                }
                break;
-               /* LINTED (enumeration values not handled in switch) */
+               /* LINTED206: (enumeration values not handled in switch) */
        case DECAFT:
        case XORASS:
        case SHLASS:
diff -r cbb826d53116 -r 71729383566e usr.bin/xlint/xlint/lint.1
--- a/usr.bin/xlint/xlint/lint.1        Fri Apr 19 18:46:50 2013 +0000
+++ b/usr.bin/xlint/xlint/lint.1        Fri Apr 19 18:51:14 2013 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: lint.1,v 1.36 2013/04/19 18:46:50 christos Exp $
+.\" $NetBSD: lint.1,v 1.37 2013/04/19 18:51:14 christos Exp $
 .\"
 .\" Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
 .\" Copyright (c) 1994, 1995 Jochen Pohl
@@ -446,7 +446,7 @@
 in this file as
 .Em used .
 Also shut off complaints about unused function arguments.
-.It Li /* LINTED Ns Ar n Li Oo Ar comment Oc Li */ No or Li /* NOSTRICT Oo Ar comment Oc Li */
+.It Li /* LINTED Ns Ar n Li Oo Ar comment Oc Li */ No or Li /* NOSTRICT Ns Ar n Li Oo Ar comment Oc Li */
 Suppresses any intra-file warning except those dealing with
 unused variables or functions.
 This directive should be placed