From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 12 Feb 2010 14:24:24 +0000 (+1300)
Subject: Remove duplicate basic auth authenticatestatedata
X-Git-Tag: SQUID_3_2_0_1~167^2~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a623c8283d9d312202891d7d8bff01a9b712a102;p=thirdparty%2Fsquid.git

Remove duplicate basic auth authenticatestatedata
---

diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc
index a5479c7b63..df89259903 100644
--- a/src/auth/basic/auth_basic.cc
+++ b/src/auth/basic/auth_basic.cc
@@ -39,12 +39,13 @@
 
 #include "squid.h"
 #include "auth/basic/auth_basic.h"
+#include "auth/basic/basicScheme.h"
 #include "auth/basic/basicUserRequest.h"
 #include "auth/Gadgets.h"
+#include "auth/State.h"
 #include "CacheManager.h"
 #include "Store.h"
 #include "HttpReply.h"
-#include "auth/basic/basicScheme.h"
 #include "rfc1738.h"
 #include "wordlist.h"
 #include "SquidTime.h"
@@ -141,7 +142,7 @@ BasicUser::~BasicUser()
 static void
 authenticateBasicHandleReply(void *data, char *reply)
 {
-    AuthenticateStateData *r = static_cast<AuthenticateStateData *>(data);
+    authenticateStateData *r = static_cast<authenticateStateData *>(data);
     BasicAuthQueueNode *tmpnode;
     char *t = NULL;
     void *cbdata;
@@ -256,8 +257,6 @@ authenticateBasicStats(StoreEntry * sentry)
     helperStats(sentry, basicauthenticators, "Basic Authenticator Statistics");
 }
 
-CBDATA_TYPE(AuthenticateStateData);
-
 static AuthUser *
 authBasicAuthUserFindUsername(const char *username)
 {
@@ -518,7 +517,7 @@ AuthBasicConfig::init(AuthConfig * schemeCfg)
 
         helperOpenServers(basicauthenticators);
 
-        CBDATA_INIT_TYPE(AuthenticateStateData);
+        CBDATA_INIT_TYPE(authenticateStateData);
     }
 }
 
@@ -550,10 +549,10 @@ BasicUser::submitRequest(AuthUserRequest::Pointer auth_user_request, RH * handle
 {
     /* mark the user as having verification in progress */
     flags.credentials_ok = 2;
-    AuthenticateStateData *r = NULL;
+    authenticateStateData *r = NULL;
     char buf[8192];
     char user[1024], pass[1024];
-    r = cbdataAlloc(AuthenticateStateData);
+    r = cbdataAlloc(authenticateStateData);
     r->handler = handler;
     r->data = cbdataReference(data);
     r->auth_user_request = auth_user_request;
diff --git a/src/auth/basic/auth_basic.h b/src/auth/basic/auth_basic.h
index 8c2c33baf3..c84280e385 100644
--- a/src/auth/basic/auth_basic.h
+++ b/src/auth/basic/auth_basic.h
@@ -14,19 +14,7 @@
 
 #define DefaultAuthenticateChildrenMax  32	/* 32 processes */
 
-/* Generic */
-
-class AuthenticateStateData
-{
-
-public:
-    void *data;
-    AuthUserRequest::Pointer auth_user_request;
-    RH *handler;
-};
-
-/* queue of auth requests waiting for verification to occur */
-
+/** queue of auth requests waiting for verification to occur */
 class BasicAuthQueueNode
 {