Browse Source

make CONFIG_CONFIG=:configdbg=1 work

cxgeorge 24 years ago
parent
commit
49582077a1
3 changed files with 10 additions and 14 deletions
  1. 4 11
      dtool/src/dconfig/configTable.I
  2. 1 0
      dtool/src/dconfig/configTable.h
  3. 5 3
      dtool/src/dconfig/dconfig.h

+ 4 - 11
dtool/src/dconfig/configTable.I

@@ -18,22 +18,15 @@
 
 
 
 
 INLINE void ConfigTable::ConfigDbgDefault(void) {
 INLINE void ConfigTable::ConfigDbgDefault(void) {
-/*
 #ifdef NDEBUG
 #ifdef NDEBUG
-*/
-
   configdbg = false;
   configdbg = false;
   microconfig_cat->set_severity(NS_info);
   microconfig_cat->set_severity(NS_info);
   dconfig_cat->set_severity(NS_info);
   dconfig_cat->set_severity(NS_info);
-
-/*
-#else * NDEBUG *
-
+#else
   configdbg = true;
   configdbg = true;
-  microconfig_cat->set_severity(NS_debug);
-  config_cat->set_severity(NS_debug);
-#endif * NDEBUG *
-*/
+  microconfig_cat->set_severity(NS_spam);
+  dconfig_cat->set_severity(NS_spam);
+#endif 
 }
 }
 
 
 INLINE void ConfigTable::ReadArgsDefault(void) {
 INLINE void ConfigTable::ReadArgsDefault(void) {

+ 1 - 0
dtool/src/dconfig/configTable.h

@@ -87,6 +87,7 @@ class EXPCL_DTOOLCONFIG ConfigTable {
       const Symbol& GetSym(const ConfigString& sym,
       const Symbol& GetSym(const ConfigString& sym,
                            const ConfigString qual = "");
                            const ConfigString qual = "");
       INLINE ConfigString GetConfigPath(void) const;
       INLINE ConfigString GetConfigPath(void) const;
+      INLINE bool IsConfigDbg(void) { return configdbg; };
 };
 };
 
 
 #include "configTable.I"
 #include "configTable.I"

+ 5 - 3
dtool/src/dconfig/dconfig.h

@@ -128,7 +128,7 @@ void Config<GetConfig>::Init(void)
       return;
       return;
    total_time_config_init -= clock();
    total_time_config_init -= clock();
    Flag(true);
    Flag(true);
-   ConfigTable::Instance();
+   ConfigTable* tab = ConfigTable::Instance();
 
 
    if (Defined("notify-level-config")) {
    if (Defined("notify-level-config")) {
       ConfigString s = Get("notify-level-config");
       ConfigString s = Get("notify-level-config");
@@ -141,8 +141,10 @@ void Config<GetConfig>::Init(void)
          dconfig_cat->set_severity(NS_info);
          dconfig_cat->set_severity(NS_info);
       }
       }
    } else {
    } else {
-      microconfig_cat->set_severity(NS_info);
-      dconfig_cat->set_severity(NS_info);
+      if(!tab->IsConfigDbg()) {
+          microconfig_cat->set_severity(NS_info);
+          dconfig_cat->set_severity(NS_info);
+      }
    }
    }
 
 
    total_time_config_init += clock();
    total_time_config_init += clock();