Module Name: src
Committed By: dholland
Date: Mon Mar 12 03:04:56 UTC 2012
Modified Files:
src/usr.bin/config: defs.h lint.c
Log Message:
Remove the NV_OBSOLETE flag, which is no longer needed. While here,
update an outdated comment about condition expressions.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/config/defs.h
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/config/lint.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.42 src/usr.bin/config/defs.h:1.43
--- src/usr.bin/config/defs.h:1.42 Mon Mar 12 02:58:55 2012
+++ src/usr.bin/config/defs.h Mon Mar 12 03:04:56 2012
@@ -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 @@ struct nvlist {
int nv_ifunit; /* XXX XXX XXX */
int nv_flags;
#define NV_DEPENDED 1
-#define NV_OBSOLETE 2
};
/*
@@ -328,11 +327,9 @@ struct filetype
/*
* 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
Index: src/usr.bin/config/lint.c
diff -u src/usr.bin/config/lint.c:1.12 src/usr.bin/config/lint.c:1.13
--- src/usr.bin/config/lint.c:1.12 Mon Mar 12 02:58:55 2012
+++ src/usr.bin/config/lint.c Mon Mar 12 03:04:56 2012
@@ -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 @@ do_emit_fs(const char *name, struct nvli
{
const struct opt_type *ot = v;
- assert((nv->nv_flags & NV_OBSOLETE) == 0);
-
if (ht_lookup(*(ot->ot_ht), name))
return 0;
