From: Kinkie <kinkie@squid-cache.org>
Date: Mon, 30 Jun 2008 09:58:05 +0000 (+0200)
Subject: Yet more refactoring.
X-Git-Tag: SQUID_3_1_0_1~49^2~143^2~53^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=347ff0da25a75fd9fa7efad230a9de2defe63fcb;p=thirdparty%2Fsquid.git

Yet more refactoring.
---

diff --git a/src/CacheManager.h b/src/CacheManager.h
index 8078423560..34344a2ce5 100644
--- a/src/CacheManager.h
+++ b/src/CacheManager.h
@@ -120,6 +120,8 @@ private:
     static void MenuCommand(StoreEntry *sentry);
     static void OfflineToggleCommand(StoreEntry *sentry);
 
+    void StateFree(cachemgrStateData * mgr);
+
 
 };
 
diff --git a/src/cache_manager.cc b/src/cache_manager.cc
index 2f4cce6e0c..bab838068a 100644
--- a/src/cache_manager.cc
+++ b/src/cache_manager.cc
@@ -51,7 +51,6 @@
 #define MGR_PASSWD_SZ 128
 
 
-static void cachemgrStateFree(cachemgrStateData * mgr);
 
 /// \ingroup CacheManagerInternal
 CacheManagerAction *ActionTable = NULL;
@@ -223,8 +222,8 @@ CacheManager::CheckPassword(cachemgrStateData * mgr)
 }
 
 /// \ingroup CacheManagerInternal
-static void
-cachemgrStateFree(cachemgrStateData * mgr)
+void
+CacheManager::StateFree(cachemgrStateData * mgr)
 {
     safe_free(mgr->action);
     safe_free(mgr->user_name);
@@ -297,7 +296,7 @@ CacheManager::Start(int fd, HttpRequest * request, StoreEntry * entry)
 
         entry->complete();
 
-        cachemgrStateFree(mgr);
+        StateFree(mgr);
 
         return;
     }
@@ -332,7 +331,7 @@ CacheManager::Start(int fd, HttpRequest * request, StoreEntry * entry)
     if (a->flags.atomic)
         entry->complete();
 
-    cachemgrStateFree(mgr);
+    StateFree(mgr);
 }
 
 /// \ingroup CacheManagerInternal