[src/trunk]: src/usr.bin/config In ioconfname mode, #define IOCONF as the ioc...

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

details:   https://anonhg.NetBSD.org/src/rev/31a11d8e8cc8
branches:  trunk
changeset: 341579:31a11d8e8cc8
user:      pooka <pooka%NetBSD.org@localhost>
date:      Thu Nov 12 14:38:21 2015 +0000

description:
In ioconfname mode, #define IOCONF as the ioconf token.

Avoids having to retype the name to call config_init/fini_component().

diffstat:

 usr.bin/config/defs.h     |  4 ++--
 usr.bin/config/mkioconf.c |  6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r 8277db4c4032 -r 31a11d8e8cc8 usr.bin/config/defs.h
--- a/usr.bin/config/defs.h     Thu Nov 12 12:19:49 2015 +0000
+++ b/usr.bin/config/defs.h     Thu Nov 12 14:38:21 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.93 2015/09/04 10:16:35 uebayasi Exp $       */
+/*     $NetBSD: defs.h,v 1.94 2015/11/12 14:38:21 pooka Exp $  */
 
 /*
  * Copyright (c) 1992, 1993
@@ -107,7 +107,7 @@
  * The next two lines define the current version of the config(1) binary,
  * and the minimum version of the configuration files it supports.
  */
-#define CONFIG_VERSION         20150846
+#define CONFIG_VERSION         20151112
 #define CONFIG_MINVERSION      0
 
 /*
diff -r 8277db4c4032 -r 31a11d8e8cc8 usr.bin/config/mkioconf.c
--- a/usr.bin/config/mkioconf.c Thu Nov 12 12:19:49 2015 +0000
+++ b/usr.bin/config/mkioconf.c Thu Nov 12 14:38:21 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkioconf.c,v 1.32 2015/09/03 13:53:36 uebayasi Exp $   */
+/*     $NetBSD: mkioconf.c,v 1.33 2015/11/12 14:38:21 pooka Exp $      */
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: mkioconf.c,v 1.32 2015/09/03 13:53:36 uebayasi Exp $");
+__RCSID("$NetBSD: mkioconf.c,v 1.33 2015/11/12 14:38:21 pooka Exp $");
 
 #include <sys/param.h>
 #include <err.h>
@@ -93,6 +93,8 @@
        }
 
        fprintf(fp, "#include \"ioconf.h\"\n");
+       if (ioconfname)
+               fprintf(fp, "#define IOCONF %s\n", ioconfname);
 
        emithdr(fp);
        emitcfdrivers(fp);