From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Wed, 9 Jul 2008 13:51:36 +0000 (+0200)
Subject: Moved action "config" to singleton API.
X-Git-Tag: SQUID_3_1_0_1~49^2~143^2~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd9b1081aa471787b9d622e71d526f201a1846ad;p=thirdparty%2Fsquid.git

Moved action "config" to singleton API.
---

diff --git a/src/ConfigParser.h b/src/ConfigParser.h
index 7e12eb6ecb..20055bbb4f 100644
--- a/src/ConfigParser.h
+++ b/src/ConfigParser.h
@@ -38,10 +38,6 @@
 
 #include "squid.h"
 
-/* forward decls */
-
-class CacheManager;
-
 /*
  * A configuration file Parser. Instances of this class track
  * parsing state and perform tokenisation. Syntax is currently
@@ -66,6 +62,6 @@ public:
     static char * strtokFile();
 };
 
-extern int parseConfigFile(const char *file_name, CacheManager & manager);
+extern int parseConfigFile(const char *file_name);
 
 #endif /* SQUID_CONFIGPARSER_H */
diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index f845cf2f2c..59a28d139a 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -382,9 +382,10 @@ parseOneConfigFile(const char *file_name, unsigned int depth)
 }
 
 int
-parseConfigFile(const char *file_name, CacheManager & manager)
+parseConfigFile(const char *file_name)
 {
     int err_count = 0;
+    CacheManager *manager=CacheManager::GetInstance();
 
     configFreeMemory();
 
@@ -409,7 +410,7 @@ parseConfigFile(const char *file_name, CacheManager & manager)
     }
 
     if (opt_send_signal == -1) {
-        manager.registerAction("config",
+        manager->registerAction("config",
                                "Current Squid Configuration",
                                dump_config,
                                1, 1);
diff --git a/src/main.cc b/src/main.cc
index 3de422ca00..72999d2d49 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -694,7 +694,7 @@ mainReconfigure(void)
     refererCloseLog();
     errorClean();
     enter_suid();		/* root to read config file */
-    parseConfigFile(ConfigFile, *manager);
+    parseConfigFile(ConfigFile);
     setUmask(Config.umask);
     Mem::Report();
     setEffectiveUser();
@@ -1263,7 +1263,7 @@ main(int argc, char **argv)
         /* we may want the parsing process to set this up in the future */
         Store::Root(new StoreController);
 
-        parse_err = parseConfigFile(ConfigFile, *manager);
+        parse_err = parseConfigFile(ConfigFile);
 
         Mem::Report();