Last round of initialization refactoring.

CacheManager is not needed anymore in main.cc

diff --git a/src/StoreFileSystem.cc b/src/StoreFileSystem.cc
index db74d3e9926887c9562014e298bdeeebaebdbbd5..c8a65158d1fdf73175988d52aa55f2e4011a88b5 100644 (file)
--- a/src/StoreFileSystem.cc
+++ b/src/StoreFileSystem.cc
@@ -40,7 +40,7 @@
 Vector<StoreFileSystem*> *StoreFileSystem::_FileSystems = NULL;
 
 void
-StoreFileSystem::RegisterAllFsWithCacheManager(CacheManager & manager)
+StoreFileSystem::RegisterAllFsWithCacheManager(void)
 {
     for (iterator i = GetFileSystems().begin(); i != GetFileSystems().end(); ++i)
         (*i)->registerWithCacheManager();

diff --git a/src/StoreFileSystem.h b/src/StoreFileSystem.h
index c4e532abeb930c20c5ee22f2556b3cd6bc626907..453f2caf3e8a8455fc40df712c2eab89fd176e9d 100644 (file)
--- a/src/StoreFileSystem.h
+++ b/src/StoreFileSystem.h
@@ -117,7 +117,7 @@ class StoreFileSystem
 {
 
 public:
-    static void RegisterAllFsWithCacheManager(CacheManager & manager);
+    static void RegisterAllFsWithCacheManager(void);
     static void SetupAllFs();
     static void FsAdd(StoreFileSystem &);
     static void FreeAllFs();

diff --git a/src/main.cc b/src/main.cc
index c6467fca3b6942e8ef1f27a0be481e27c5c76009..8cb5b7ed6d1121a200873f856b7a151f556a0a90 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -35,7 +35,6 @@
 #include "squid.h"
 #include "AccessLogEntry.h"
 #include "authenticate.h"
-#include "CacheManager.h"
 #include "ConfigParser.h"
 #include "errorpage.h"
 #include "event.h"
@@ -136,8 +135,6 @@ static const char *squid_start_script = "squid_start";
 #include "test_access.c"
 #endif
 
-static CacheManager *manager=CacheManager::GetInstance();
-
 /** temporary thunk across to the unrefactored store interface */
 
 class StoreRootEngine : public AsyncEngine
@@ -1026,7 +1023,7 @@ mainInitialize(void)
         refreshRegisterWithCacheManager();
         statRegisterWithCacheManager();
         storeDigestRegisterWithCacheManager();
-        StoreFileSystem::RegisterAllFsWithCacheManager(*manager);
+        StoreFileSystem::RegisterAllFsWithCacheManager();
         storeRegisterWithCacheManager();
         storeLogRegisterWithCacheManager();
 #if DEBUGSTRINGS