Renamed squid.h to squid-old.h and config.h to squid.h

[thirdparty/squid.git] / src / auth / Scheme.cc

diff --git a/src/auth/Scheme.cc b/src/auth/Scheme.cc
index 5ccea370b9a7f25a7cce4c5caf82f0ee40ad9e75..e63f6d3060214c37826a8e4bfc58a26a2c8458c7 100644 (file)
--- a/src/auth/Scheme.cc
+++ b/src/auth/Scheme.cc
@@ -33,15 +33,15 @@
  * Copyright (c) 2004, Robert Collins <robertc@squid-cache.org>
  */
 
-#include "squid.h"
+#include "squid-old.h"
 #include "auth/Scheme.h"
 #include "auth/Gadgets.h"
 #include "auth/Config.h"
 
-Vector<AuthScheme::Pointer> *AuthScheme::_Schemes = NULL;
+Vector<Auth::Scheme::Pointer> *Auth::Scheme::_Schemes = NULL;
 
 void
-AuthScheme::AddScheme(AuthScheme::Pointer instance)
+Auth::Scheme::AddScheme(Auth::Scheme::Pointer instance)
 {
     iterator i = GetSchemes().begin();
 
@@ -53,30 +53,22 @@ AuthScheme::AddScheme(AuthScheme::Pointer instance)
     GetSchemes().push_back(instance);
 }
 
-AuthScheme::Pointer
-AuthScheme::Find(const char *typestr)
+Auth::Scheme::Pointer
+Auth::Scheme::Find(const char *typestr)
 {
     for (iterator i = GetSchemes().begin(); i != GetSchemes().end(); ++i) {
-        if (strcmp ((*i)->type(), typestr) == 0)
+        if (strcmp((*i)->type(), typestr) == 0)
             return *i;
     }
 
-    return AuthScheme::Pointer(NULL);
+    return Auth::Scheme::Pointer(NULL);
 }
 
-#if 0 // with ref-counting we never have a constant version of *::Pointer
-Vector<AuthScheme::Pointer> const &
-AuthScheme::Schemes()
-{
-    return GetSchemes();
-}
-#endif
-
-Vector<AuthScheme::Pointer> &
-AuthScheme::GetSchemes()
+Vector<Auth::Scheme::Pointer> &
+Auth::Scheme::GetSchemes()
 {
     if (!_Schemes)
-        _Schemes = new Vector<AuthScheme::Pointer>;
+        _Schemes = new Vector<Auth::Scheme::Pointer>;
 
     return *_Schemes;
 }
@@ -89,13 +81,13 @@ AuthScheme::GetSchemes()
  * connections will retain pointers to them.
  */
 void
-AuthScheme::FreeAll()
+Auth::Scheme::FreeAll()
 {
-    assert(false); // NP: this should NOT happen during regular progarm execution...
+    assert(shutting_down);
 
     while (GetSchemes().size()) {
-        AuthScheme::Pointer scheme = GetSchemes().back();
+        Auth::Scheme::Pointer scheme = GetSchemes().back();
         GetSchemes().pop_back();
-        scheme->done();
+        scheme->shutdownCleanup();
     }
 }