[src/trunk]: src/usr.bin/config Put cfdata* in a similar namespace with cfdri...

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

details:   https://anonhg.NetBSD.org/src/rev/c2dac994c13a
branches:  trunk
changeset: 753398:c2dac994c13a
user:      pooka <pooka%NetBSD.org@localhost>
date:      Fri Mar 26 15:51:17 2010 +0000

description:
Put cfdata* in a similar namespace with cfdriver** cfattachinit*.
This was nagging me already yesterday, but I decided to leave it
alone for better compat with old ioconf.c builds.  But as it turns
out, new code depends on newly built ioconf.c with a new config(1)
anyway, so renaming is not an issue (at least not at this stage).

While renaming, namespace cfdriver and cfattach in "ioconf" rather
than "comp", since the former reflects the config(5) keyword.

diffstat:

 usr.bin/config/mkioconf.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 04cbb5502ded -r c2dac994c13a usr.bin/config/mkioconf.c
--- a/usr.bin/config/mkioconf.c Fri Mar 26 15:46:04 2010 +0000
+++ b/usr.bin/config/mkioconf.c Fri Mar 26 15:51:17 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkioconf.c,v 1.17 2010/03/25 19:39:05 pooka Exp $      */
+/*     $NetBSD: mkioconf.c,v 1.18 2010/03/26 15:51:17 pooka Exp $      */
 
 /*
  * Copyright (c) 1992, 1993
@@ -240,7 +240,7 @@
        fprintf(fp,
            "%sstruct cfdriver * const cfdriver_%s_%s[] = {\n",
            ioconfname ? "static " : "",
-           ioconfname ? "comp" : "list",
+           ioconfname ? "ioconf" : "list",
            ioconfname ? ioconfname : "initial");
 
        TAILQ_FOREACH(d, &allbases, d_next) {
@@ -292,7 +292,7 @@
        NEWLINE;
        fprintf(fp, "%sconst struct cfattachinit cfattach%s%s[] = {\n",
            ioconfname ? "static " : "",
-           ioconfname ? "_comp_" : "init",
+           ioconfname ? "_ioconf_" : "init",
            ioconfname ? ioconfname : "");
 
        TAILQ_FOREACH(d, &allbases, d_next) {
@@ -377,7 +377,7 @@
                "    /* driver           attachment    unit state "
                "loc   flags pspec */\n",
                    ioconfname ? "static " : "",
-                   ioconfname ? "_" : "",
+                   ioconfname ? "_ioconf_" : "",
                    ioconfname ? ioconfname : "");
        for (p = packed; (i = *p) != NULL; p++) {
                /* the description */