From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Thu, 3 Jun 2010 00:12:32 +0000 (-0600)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_3_2_0_1~166
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec5858ffb418da5b8920db13b351a6770c4560ce;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/auth/Acl.cc b/src/auth/Acl.cc
index 6e43bca198..0974f94a79 100644
--- a/src/auth/Acl.cc
+++ b/src/auth/Acl.cc
@@ -33,8 +33,8 @@ AuthenticateAcl(ACLChecklist *ch)
     /* get authed here */
     /* Note: this fills in auth_user_request when applicable */
     const AuthAclState result = AuthUserRequest::tryToAuthenticateAndSetAuthUser(
-                                  &checklist->auth_user_request, headertype, request,
-                                  checklist->conn(), checklist->src_addr);
+                                    &checklist->auth_user_request, headertype, request,
+                                    checklist->conn(), checklist->src_addr);
     switch (result) {
 
     case AUTH_ACL_CANNOT_AUTHENTICATE:
diff --git a/src/auth/Config.h b/src/auth/Config.h
index 8ea2eca233..26ecdbfe01 100644
--- a/src/auth/Config.h
+++ b/src/auth/Config.h
@@ -129,7 +129,7 @@ public:
     virtual const char * type() const = 0;
 
 public:
-    HelperChildConfig authenticateChildren;    
+    HelperChildConfig authenticateChildren;
     wordlist *authenticate;
 };
 
diff --git a/src/auth/Gadgets.h b/src/auth/Gadgets.h
index 11de64c42c..7f140b2a2f 100644
--- a/src/auth/Gadgets.h
+++ b/src/auth/Gadgets.h
@@ -52,7 +52,8 @@ class AuthUser;
  * is recorded in the cache. Any caller using hash_remove_link
  * must then delete the AuthUserHashPointer.
  */
-class AuthUserHashPointer : public hash_link {
+class AuthUserHashPointer : public hash_link
+{
     /* first two items must be same as hash_link */
 
 public:
diff --git a/src/auth/User.cc b/src/auth/User.cc
index 1dc586902b..31e11c3634 100644
--- a/src/auth/User.cc
+++ b/src/auth/User.cc
@@ -61,7 +61,7 @@ AuthUser::AuthUser(AuthConfig *aConfig) :
         config(aConfig),
         ipcount(0),
         expiretime(0),
-	credentials_state(Unchecked),
+        credentials_state(Unchecked),
         username_(NULL)
 {
     proxy_auth_list.head = proxy_auth_list.tail = NULL;
@@ -390,6 +390,6 @@ AuthUser::UsernameCacheStats(StoreEntry *output)
                           auth_user->ttl(),
                           static_cast<int32_t>(auth_user->expiretime - squid_curtime + Config.authenticateTTL),
                           auth_user->username()
-                          );
+                         );
     }
 }
diff --git a/src/auth/digest/digestUserRequest.cc b/src/auth/digest/digestUserRequest.cc
index f51b7ea964..0816f98743 100644
--- a/src/auth/digest/digestUserRequest.cc
+++ b/src/auth/digest/digestUserRequest.cc
@@ -101,7 +101,7 @@ AuthDigestUserRequest::authenticate(HttpRequest * request, ConnStateData * conn,
             return;
         }
 
-       if (static_cast<AuthDigestConfig*>(AuthConfig::Find("digest"))->PostWorkaround && request->method != METHOD_GET) {
+        if (static_cast<AuthDigestConfig*>(AuthConfig::Find("digest"))->PostWorkaround && request->method != METHOD_GET) {
             /* Ugly workaround for certain very broken browsers using the
              * wrong method to calculate the request-digest on POST request.
              * This should be deleted once Digest authentication becomes more
diff --git a/src/auth/negotiate/negotiateUserRequest.cc b/src/auth/negotiate/negotiateUserRequest.cc
index e9e08632de..7127798d35 100644
--- a/src/auth/negotiate/negotiateUserRequest.cc
+++ b/src/auth/negotiate/negotiateUserRequest.cc
@@ -256,7 +256,7 @@ AuthNegotiateUserRequest::authenticate(HttpRequest * aRequest, ConnStateData * c
         /* we've failed somewhere in authentication */
         debugs(29, 9, HERE << "auth state negotiate failed. " << proxy_auth);
         break;
-   }
+    }
 
     return;
 }
@@ -277,7 +277,7 @@ AuthNegotiateUserRequest::HandleReply(void *data, void *lastserver, char *reply)
         cbdataReferenceDone(r->data);
         authenticateStateFree(r);
         return;
-   }
+    }
 
     if (!reply) {
         debugs(29, DBG_IMPORTANT, "ERROR: Negotiate Authentication Helper '" << lastserver << "' crashed!.");
diff --git a/src/auth/ntlm/ntlmUserRequest.cc b/src/auth/ntlm/ntlmUserRequest.cc
index cf0776b8da..6182426c65 100644
--- a/src/auth/ntlm/ntlmUserRequest.cc
+++ b/src/auth/ntlm/ntlmUserRequest.cc
@@ -82,7 +82,7 @@ AuthNTLMUserRequest::module_start(RH * handler, void *data)
     if (static_cast<AuthNTLMConfig*>(AuthConfig::Find("ntlm"))->authenticate == NULL) {
         debugs(29, DBG_CRITICAL, "ERROR: NTLM Start: no NTLM program configured.");
         handler(data, NULL);
-       return;
+        return;
     }
 
     r = cbdataAlloc(authenticateStateData);
diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 1bb1ea226c..113c5df4c2 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1484,7 +1484,7 @@ free_authparam(Auth::authConfig * cfg)
     }
 
     /* on reconfigure initialize new auth schemes for the new config. */
-    if(reconfiguring) {
+    if (reconfiguring) {
         InitAuthSchemes();
     }
 }
diff --git a/src/protos.h b/src/protos.h
index 23c2c0d683..1e216621d9 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -790,7 +790,7 @@ class external_acl;
             SQUIDCEXTERN char *peer_proxy_negotiate_auth(char *principal_name, char *proxy);
 #endif
 
-/* call to ensure the auth component schemes exist. */
-SQUIDCEXTERN void InitAuthSchemes(void);
+            /* call to ensure the auth component schemes exist. */
+            SQUIDCEXTERN void InitAuthSchemes(void);
 
 #endif /* SQUID_PROTOS_H */