Module Name: src
Committed By: uebayasi
Date: Sat Oct 11 03:17:40 UTC 2014
Modified Files:
src/usr.bin/config: defs.h main.c util.c
Log Message:
Enable debug for tools.
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/usr.bin/config/defs.h
cvs rdiff -u -r1.64 -r1.65 src/usr.bin/config/main.c
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/config/util.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/defs.h
diff -u src/usr.bin/config/defs.h:1.55 src/usr.bin/config/defs.h:1.56
--- src/usr.bin/config/defs.h:1.55 Fri Oct 10 12:10:02 2014
+++ src/usr.bin/config/defs.h Sat Oct 11 03:17:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.55 2014/10/10 12:10:02 uebayasi Exp $ */
+/* $NetBSD: defs.h,v 1.56 2014/10/11 03:17:40 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -631,15 +631,11 @@ int onlist(struct nvlist *, void *);
void prefix_push(const char *);
void prefix_pop(void);
char *sourcepath(const char *);
-#ifndef MAKE_BOOTSTRAP
extern int dflag;
#define CFGDBG(n, ...) \
do { if ((dflag) >= (n)) cfgdbg(__VA_ARGS__); } while (0)
void cfgdbg(const char *, ...) /* debug info */
__printflike(1, 2);
-#else
-#define CFGDBG(n, ...) /* */
-#endif
void cfgwarn(const char *, ...) /* immediate warns */
__printflike(1, 2);
void cfgxwarn(const char *, int, const char *, ...) /* delayed warns */
Index: src/usr.bin/config/main.c
diff -u src/usr.bin/config/main.c:1.64 src/usr.bin/config/main.c:1.65
--- src/usr.bin/config/main.c:1.64 Fri Oct 10 16:17:27 2014
+++ src/usr.bin/config/main.c Sat Oct 11 03:17:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.64 2014/10/10 16:17:27 uebayasi Exp $ */
+/* $NetBSD: main.c,v 1.65 2014/10/11 03:17:40 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -92,8 +92,8 @@ int yyparse(void);
#ifndef MAKE_BOOTSTRAP
extern int yydebug;
-int dflag;
#endif
+int dflag;
static struct dlhash *obsopttab;
static struct hashtab *mkopttab;
@@ -164,12 +164,12 @@ main(int argc, char **argv)
while ((ch = getopt(argc, argv, "D:LMPU:dgpvb:s:x")) != -1) {
switch (ch) {
-#ifndef MAKE_BOOTSTRAP
case 'd':
+#ifndef MAKE_BOOTSTRAP
yydebug = 1;
+#endif
dflag++;
break;
-#endif
case 'M':
usekobjs = 1;
Index: src/usr.bin/config/util.c
diff -u src/usr.bin/config/util.c:1.17 src/usr.bin/config/util.c:1.18
--- src/usr.bin/config/util.c:1.17 Thu Oct 9 06:45:31 2014
+++ src/usr.bin/config/util.c Sat Oct 11 03:17:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.17 2014/10/09 06:45:31 uebayasi Exp $ */
+/* $NetBSD: util.c,v 1.18 2014/10/11 03:17:40 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -57,10 +57,8 @@
static void cfgvxerror(const char *, int, const char *, va_list)
__printflike(3, 0);
-#ifndef MAKE_BOOTSTRAP
static void cfgvxdbg(const char *, int, const char *, va_list)
__printflike(3, 0);
-#endif
static void cfgvxwarn(const char *, int, const char *, va_list)
__printflike(3, 0);
static void cfgvxmsg(const char *, int, const char *, const char *, va_list)
@@ -417,7 +415,6 @@ condexpr_destroy(struct condexpr *expr)
* Diagnostic messages
*/
-#ifndef MAKE_BOOTSTRAP
void
cfgdbg(const char *fmt, ...)
{
@@ -428,7 +425,6 @@ cfgdbg(const char *fmt, ...)
cfgvxdbg(yyfile, currentline(), fmt, ap);
va_end(ap);
}
-#endif
void
cfgwarn(const char *fmt, ...)
@@ -451,13 +447,11 @@ cfgxwarn(const char *file, int line, con
va_end(ap);
}
-#ifndef MAKE_BOOTSTRAP
static void
cfgvxdbg(const char *file, int line, const char *fmt, va_list ap)
{
cfgvxmsg(file, line, "debug: ", fmt, ap);
}
-#endif
static void
cfgvxwarn(const char *file, int line, const char *fmt, va_list ap)
