From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Sat, 12 Jul 2008 06:25:45 +0000 (+0200)
Subject: More cache manager initialization calls reshuffling.
X-Git-Tag: SQUID_3_1_0_1~49^2~143^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=372fb44eda301ac7f2d520d6af87c363f8d18a5e;p=thirdparty%2Fsquid.git

More cache manager initialization calls reshuffling.
---

diff --git a/src/dns.cc b/src/dns.cc
index 004ede5fb9..8e2c0c8f93 100644
--- a/src/dns.cc
+++ b/src/dns.cc
@@ -60,6 +60,8 @@ dnsInit(void)
 {
     wordlist *w;
 
+    dnsRegisterWithCacheManager();
+
     if (!Config.Program.dnsserver)
         return;
 
diff --git a/src/dns_internal.cc b/src/dns_internal.cc
index f5f52aed79..f9d92a48ee 100755
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -1381,6 +1381,8 @@ idnsInit(void)
         idns_lookup_hash = hash_create((HASHCMP *) strcmp, 103, hash_string);
         init++;
     }
+
+    idnsRegisterWithCacheManager();
 }
 
 void
diff --git a/src/main.cc b/src/main.cc
index 7cf72217c7..62d732d2ab 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -995,7 +995,7 @@ mainInitialize(void)
 	//  moved to each module's init() function
 #if USE_DNSSERVERS
 
-        dnsRegisterWithCacheManager();
+        // dnsRegisterWithCacheManager(); //moved to dnsInit()
 #endif
 
         eventInit();
@@ -1004,8 +1004,9 @@ mainInitialize(void)
         FwdState::RegisterWithCacheManager();
         httpHeaderRegisterWithCacheManager();
 #if !USE_DNSSERVERS
-
-        idnsRegisterWithCacheManager();
+	//TODO: remove cache manager registration functions from namespace
+	//      (protos.h and make them static where appropriate)
+        // idnsRegisterWithCacheManager(); // moved to idnsInit()
 #endif
 
         // ipcacheRegisterWithCacheManager(); //moved to ipcache_init()