Module Name: src
Committed By: pooka
Date: Wed Mar 3 13:53:22 UTC 2010
Modified Files:
src/usr.bin/config: config.5 defs.h gram.y main.c
Log Message:
Remove fs_foo.h support from deffs now that nothing uses it.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/config/config.5 \
src/usr.bin/config/gram.y
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/config/defs.h
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/config/main.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/config.5
diff -u src/usr.bin/config/config.5:1.20 src/usr.bin/config/config.5:1.21
--- src/usr.bin/config/config.5:1.20 Fri Feb 20 05:26:51 2009
+++ src/usr.bin/config/config.5 Wed Mar 3 13:53:22 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: config.5,v 1.20 2009/02/20 05:26:51 cube Exp $
+.\" $NetBSD: config.5,v 1.21 2010/03/03 13:53:22 pooka Exp $
.\"
.\" Copyright (c) 2006, 2007 The NetBSD Foundation.
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd February 20, 2009
+.Dd March 3, 2010
.Dt CONFIG 5
.Os
.Sh NAME
@@ -355,7 +355,7 @@
will use it as a value when generating a lint configuration with
.Fl L ,
and ignore it in all other cases.
-.It Ic deffs Oo Ar file Oc Ar name Op Ar name Op Ar ...
+.It Ic deffs Ar name Op Ar name Op Ar ...
Defines a file-system name.
It is no more than a regular option, as defined by
.Ic defflag ,
Index: src/usr.bin/config/gram.y
diff -u src/usr.bin/config/gram.y:1.20 src/usr.bin/config/gram.y:1.21
--- src/usr.bin/config/gram.y:1.20 Wed Feb 3 21:00:49 2010
+++ src/usr.bin/config/gram.y Wed Mar 3 13:53:22 2010
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: gram.y,v 1.20 2010/02/03 21:00:49 pooka Exp $ */
+/* $NetBSD: gram.y,v 1.21 2010/03/03 13:53:22 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -147,7 +147,6 @@
%type <val> flags_opt
%type <str> deffs
%type <list> deffses
-%type <str> fsoptfile_opt
%type <list> defopt
%type <list> defopts
%type <str> optdep
@@ -277,8 +276,7 @@
device_major { do_devsw = 1; } |
prefix |
DEVCLASS WORD { (void)defattr($2, NULL, NULL, 1); } |
- DEFFS fsoptfile_opt deffses defoptdeps
- { deffilesystem($2, $3, $4); } |
+ DEFFS deffses defoptdeps { deffilesystem($2, $3); } |
DEFINE WORD interface_opt attrs_opt
{ (void)defattr($2, $3, $4, 0); } |
DEFOPT optfile_opt defopts defoptdeps
@@ -391,10 +389,6 @@
locdefaults:
'=' '{' values '}' { $$ = $3; };
-fsoptfile_opt:
- filename { $$ = $1; } |
- /* empty */ { $$ = NULL; };
-
optfile_opt:
filename { $$ = $1; } |
/* empty */ { $$ = NULL; };
Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.31 src/usr.bin/config/defs.h:1.32
--- src/usr.bin/config/defs.h:1.31 Wed Feb 3 21:00:49 2010
+++ src/usr.bin/config/defs.h Wed Mar 3 13:53:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.31 2010/02/03 21:00:49 pooka Exp $ */
+/* $NetBSD: defs.h,v 1.32 2010/03/03 13:53:22 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -494,7 +494,7 @@
void addmkoption(const char *, const char *);
void appendmkoption(const char *, const char *);
void appendcondmkoption(struct nvlist *, const char *, const char *);
-void deffilesystem(const char *, struct nvlist *, struct nvlist *);
+void deffilesystem(struct nvlist *, struct nvlist *);
void defoption(const char *, struct nvlist *, struct nvlist *);
void defflag(const char *, struct nvlist *, struct nvlist *, int);
void defparam(const char *, struct nvlist *, struct nvlist *, int);
Index: src/usr.bin/config/main.c
diff -u src/usr.bin/config/main.c:1.38 src/usr.bin/config/main.c:1.39
--- src/usr.bin/config/main.c:1.38 Sat Feb 13 22:57:03 2010
+++ src/usr.bin/config/main.c Wed Mar 3 13:53:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.38 2010/02/13 22:57:03 pooka Exp $ */
+/* $NetBSD: main.c,v 1.39 2010/03/03 13:53:22 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -609,7 +609,7 @@
* Otherwise, no preprocessor #defines will be generated.
*/
void
-deffilesystem(const char *fname, struct nvlist *fses, struct nvlist *deps)
+deffilesystem(struct nvlist *fses, struct nvlist *deps)
{
struct nvlist *nv;
@@ -632,23 +632,6 @@
panic("file system `%s' already in table?!",
nv->nv_name);
- if (fname != NULL) {
- /*
- * Only one file system allowed in this case.
- */
- if (nv->nv_next != NULL) {
- cfgerror("only one file system per option "
- "file may be specified");
- return;
- }
-
- if (ht_insert(optfiletab, fname, nv)) {
- cfgerror("option file `%s' already exists",
- fname);
- return;
- }
- }
-
add_dependencies(nv, deps);
}
}
