[src/trunk]: src/usr.bin/config Remove fs_foo.h support from deffs now that n...

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

details:   https://anonhg.NetBSD.org/src/rev/84c69d9cc845
branches:  trunk
changeset: 752682:84c69d9cc845
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Mar 03 13:53:22 2010 +0000

description:
Remove fs_foo.h support from deffs now that nothing uses it.

diffstat:

 usr.bin/config/config.5 |   6 +++---
 usr.bin/config/defs.h   |   4 ++--
 usr.bin/config/gram.y   |  10 ++--------
 usr.bin/config/main.c   |  21 ++-------------------
 4 files changed, 9 insertions(+), 32 deletions(-)

diffs (126 lines):

diff -r 87d3f9c4902d -r 84c69d9cc845 usr.bin/config/config.5
--- a/usr.bin/config/config.5   Wed Mar 03 13:39:57 2010 +0000
+++ b/usr.bin/config/config.5   Wed Mar 03 13:53:22 2010 +0000
@@ -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 ,
diff -r 87d3f9c4902d -r 84c69d9cc845 usr.bin/config/defs.h
--- a/usr.bin/config/defs.h     Wed Mar 03 13:39:57 2010 +0000
+++ b/usr.bin/config/defs.h     Wed Mar 03 13:53:22 2010 +0000
@@ -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);
diff -r 87d3f9c4902d -r 84c69d9cc845 usr.bin/config/gram.y
--- a/usr.bin/config/gram.y     Wed Mar 03 13:39:57 2010 +0000
+++ b/usr.bin/config/gram.y     Wed Mar 03 13:53:22 2010 +0000
@@ -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; };
diff -r 87d3f9c4902d -r 84c69d9cc845 usr.bin/config/main.c
--- a/usr.bin/config/main.c     Wed Mar 03 13:39:57 2010 +0000
+++ b/usr.bin/config/main.c     Wed Mar 03 13:53:22 2010 +0000
@@ -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);
        }
 }