[src/trunk]: src/usr.bin/config More debug messages.

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

details:   https://anonhg.NetBSD.org/src/rev/e5f1eef9ec69
branches:  trunk
changeset: 332907:e5f1eef9ec69
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Sat Oct 11 15:47:38 2014 +0000

description:
More debug messages.

diffstat:

 usr.bin/config/main.c |  10 ++++++++--
 usr.bin/config/sem.c  |   7 ++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diffs (102 lines):

diff -r 73e784c5ab8c -r e5f1eef9ec69 usr.bin/config/main.c
--- a/usr.bin/config/main.c     Sat Oct 11 15:20:36 2014 +0000
+++ b/usr.bin/config/main.c     Sat Oct 11 15:47:38 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.66 2014/10/11 09:09:19 uebayasi Exp $       */
+/*     $NetBSD: main.c,v 1.67 2014/10/11 15:47:38 uebayasi Exp $       */
 
 /*
  * Copyright (c) 1992, 1993
@@ -1006,6 +1006,7 @@
 deloption(const char *name)
 {
 
+       CFGDBG(4, "deselecting opt `%s'", name);
        if (undo_option(opttab, &options, &nextopt, name, "options"))
                return;
        if (undo_option(selecttab, NULL, NULL, strtolower(name), "options"))
@@ -1054,6 +1055,7 @@
 {
        const char *n;
 
+       CFGDBG(4, "deselecting fs `%s'", name);
        n = strtolower(name);
        if (undo_option(fsopttab, &fsoptions, &nextfsopt, name, "file-system"))
                return;
@@ -1075,6 +1077,7 @@
 delmkoption(const char *name)
 {
 
+       CFGDBG(4, "deselecting mkopt `%s'", name);
        (void)undo_option(mkopttab, &mkoptions, &nextmkopt, name,
            "makeoptions");
 }
@@ -1151,8 +1154,10 @@
                        cfgwarn("%s `%s' is not defined", type, name);
                return (1);
        }
-       if (npp == NULL)
+       if (npp == NULL) {
+               CFGDBG(2, "opt `%s' deselected", name);
                return (0);
+       }
 
        for ( ; *npp != NULL; npp = &(*npp)->nv_next) {
                if ((*npp)->nv_name != name)
@@ -1160,6 +1165,7 @@
                if (next != NULL && *next == &(*npp)->nv_next)
                        *next = npp;
                nv = (*npp)->nv_next;
+               CFGDBG(2, "opt `%s' deselected", (*npp)->nv_name);
                nvfree(*npp);
                *npp = nv;
                return (0);
diff -r 73e784c5ab8c -r e5f1eef9ec69 usr.bin/config/sem.c
--- a/usr.bin/config/sem.c      Sat Oct 11 15:20:36 2014 +0000
+++ b/usr.bin/config/sem.c      Sat Oct 11 15:47:38 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sem.c,v 1.60 2014/10/11 15:20:36 uebayasi Exp $        */
+/*     $NetBSD: sem.c,v 1.61 2014/10/11 15:47:38 uebayasi Exp $        */
 
 /*
  * Copyright (c) 1992, 1993
@@ -1043,6 +1043,7 @@
 {
        struct config *cf;
 
+       CFGDBG(5, "deselecting config `%s'", name);
        if (ht_lookup(cfhashtab, name) == NULL) {
                cfgerror("configuration `%s' undefined", name);
                return;
@@ -1260,6 +1261,7 @@
        int unit;
        char base[NAMESIZE];
 
+       CFGDBG(5, "deselecting devi `%s'", name);
        if (split(name, strlen(name), base, sizeof base, &unit)) {
                cfgerror("invalid device name `%s'", name);
                return;
@@ -1464,6 +1466,7 @@
        } else {
                int l;
 
+               CFGDBG(5, "deselecting deva `%s'", at);
                l = strlen(at) - 1;
                if (at[l] == '?' || isdigit((unsigned char)at[l])) {
                        char base[NAMESIZE];
@@ -1547,6 +1550,7 @@
        struct devi *firsti, *i;
        struct nvlist *nv, *stack = NULL;
 
+       CFGDBG(5, "deselecting dev `%s'", name);
        l = strlen(name) - 1;
        if (name[l] == '*' || isdigit((unsigned char)name[l])) {
                /* `no mydev0' or `no mydev*' */
@@ -1697,6 +1701,7 @@
        struct devbase *d;
        struct devi *i;
 
+       CFGDBG(5, "deselecting pseudo `%s'", name);
        d = ht_lookup(devbasetab, name);
        if (d == NULL) {
                cfgerror("undefined pseudo-device %s", name);