[src/trunk]: src/usr.bin/config Remove the NV_OBSOLETE flag, which is no long...

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

details:   https://anonhg.NetBSD.org/src/rev/f09ffd929d4d
branches:  trunk
changeset: 778008:f09ffd929d4d
user:      dholland <dholland%NetBSD.org@localhost>
date:      Mon Mar 12 03:04:56 2012 +0000

description:
Remove the NV_OBSOLETE flag, which is no longer needed. While here,
update an outdated comment about condition expressions.

diffstat:

 usr.bin/config/defs.h |  11 ++++-------
 usr.bin/config/lint.c |   4 +---
 2 files changed, 5 insertions(+), 10 deletions(-)

diffs (50 lines):

diff -r 9ee5e1d46c40 -r f09ffd929d4d usr.bin/config/defs.h
--- a/usr.bin/config/defs.h     Mon Mar 12 02:58:55 2012 +0000
+++ b/usr.bin/config/defs.h     Mon Mar 12 03:04:56 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.42 2012/03/12 02:58:55 dholland Exp $       */
+/*     $NetBSD: defs.h,v 1.43 2012/03/12 03:04:56 dholland Exp $       */
 
 /*
  * Copyright (c) 1992, 1993
@@ -123,7 +123,6 @@
        int             nv_ifunit;              /* XXX XXX XXX */
        int             nv_flags;
 #define        NV_DEPENDED     1
-#define        NV_OBSOLETE     2
 };
 
 /*
@@ -328,11 +327,9 @@
 /*
  * Files.  Each file is either standard (always included) or optional,
  * depending on whether it has names on which to *be* optional.  The
- * options field (fi_optx) is actually an expression tree, with nodes
- * for OR, AND, and NOT, as well as atoms (words) representing some   
- * particular option.  The node type is stored in the nv_num field.
- * Subexpressions appear in the `next' field; for the binary operators
- * AND and OR, the left subexpression is first stored in the nv_ptr field.
+ * options field (fi_optx) is an expression tree of type struct
+ * condexpr, with nodes for OR, AND, and NOT, as well as atoms (words)
+ * representing some particular option.
  * 
  * For any file marked as needs-count or needs-flag, fixfiles() will
  * build fi_optf, a `flat list' of the options with nv_num fields that
diff -r 9ee5e1d46c40 -r f09ffd929d4d usr.bin/config/lint.c
--- a/usr.bin/config/lint.c     Mon Mar 12 02:58:55 2012 +0000
+++ b/usr.bin/config/lint.c     Mon Mar 12 03:04:56 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lint.c,v 1.12 2012/03/12 02:58:55 dholland Exp $       */
+/*     $NetBSD: lint.c,v 1.13 2012/03/12 03:04:56 dholland Exp $       */
 
 /*
  *  Copyright (c) 2007 The NetBSD Foundation.
@@ -99,8 +99,6 @@
 {
        const struct opt_type *ot = v;
 
-       assert((nv->nv_flags & NV_OBSOLETE) == 0);
-
        if (ht_lookup(*(ot->ot_ht), name))
                return 0;