Refactored actions for "carp" to Cache Manager singleton API.

diff --git a/src/carp.cc b/src/carp.cc
index 9c7fa65324a297ac9631c487c83f54c14d0e4a80..da7679b988abb3070a869d0cd75f0be7332e66c8 100644 (file)
--- a/src/carp.cc
+++ b/src/carp.cc
@@ -153,9 +153,10 @@ carpInit(void)
 }
 
 void
-carpRegisterWithCacheManager(CacheManager & manager)
+carpRegisterWithCacheManager()
 {
-    manager.registerAction("carp", "CARP information", carpCachemgr, 0, 1);
+    CacheManager::GetInstance()->
+        registerAction("carp", "CARP information", carpCachemgr, 0, 1);
 }
 
 peer *

diff --git a/src/main.cc b/src/main.cc
index d2b78e9abb1979f76dbc9a7e9c8f4cad07db568e..72947fa6fb96a5b81f6de2c0b8a9f210fc844d83 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -972,7 +972,7 @@ mainInitialize(void)
         authenticateRegisterWithCacheManager(&Config.authConfiguration);
 #if USE_CARP
 
-        carpRegisterWithCacheManager(*manager);
+        carpRegisterWithCacheManager();
 #endif
 
         cbdataRegisterWithCacheManager(*manager);

diff --git a/src/protos.h b/src/protos.h
index a5362ee30f36e8c881e7852c9326d97aeca60054..ceba7c908bfd053a4827636247f48c9d399ba924 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -730,7 +730,7 @@ SQUIDCEXTERN int internalHostnameIs(const char *);
 
 #if USE_CARP
 SQUIDCEXTERN void carpInit(void);
-extern void carpRegisterWithCacheManager(CacheManager & manager);
+extern void carpRegisterWithCacheManager();
 SQUIDCEXTERN peer *carpSelectParent(HttpRequest *);
 #endif