From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 4 Sep 2015 13:38:54 +0000 (+0200)
Subject: Sourceformat
X-Git-Tag: SQUID_4_0_1~21^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7512e3f96ed527dfcd1714eeb62d8aab41f4ea97;p=thirdparty%2Fsquid.git

Sourceformat
---

diff --git a/src/auth/Config.cc b/src/auth/Config.cc
index e4fbdbcaea..7c966c1429 100644
--- a/src/auth/Config.cc
+++ b/src/auth/Config.cc
@@ -156,3 +156,4 @@ Auth::Config::done()
     keyExtras = NULL;
     keyExtrasLine.clean();
 }
+
diff --git a/src/auth/Gadgets.cc b/src/auth/Gadgets.cc
index 8a91934af8..a157721c04 100644
--- a/src/auth/Gadgets.cc
+++ b/src/auth/Gadgets.cc
@@ -131,3 +131,4 @@ authenticateCachedUsersList()
                std::back_inserter(rv), aucp_compare);
     return rv;
 }
+
diff --git a/src/auth/UserNameCache.cc b/src/auth/UserNameCache.cc
index 870be26da6..8fde52f702 100644
--- a/src/auth/UserNameCache.cc
+++ b/src/auth/UserNameCache.cc
@@ -9,8 +9,8 @@
 /* DEBUG: section 29    Authenticator */
 
 #include "squid.h"
-#include "auth/UserNameCache.h"
 #include "acl/Gadgets.h"
+#include "auth/UserNameCache.h"
 #include "Debug.h"
 #include "event.h"
 #include "SquidConfig.h"
@@ -26,7 +26,7 @@ UserNameCache::UserNameCache(const char *name) :
     debugs(29, 5, "initializing " << name << " username cache");
     cacheCleanupEventName.append(name);
     eventAdd(cacheCleanupEventName.c_str(), &UserNameCache::Cleanup,
-                    this, ::Config.authenticateGCInterval, 1);
+             this, ::Config.authenticateGCInterval, 1);
     RegisterRunner(this);
 }
 
@@ -54,16 +54,16 @@ UserNameCache::Cleanup(void *data)
     const auto end = self->store_.end();
     for (auto i = self->store_.begin(); i != end;) {
         debugs(29, 6, "considering " << i->first << "(expires in " <<
-                        (expirationTime - i->second->expiretime) << " sec)");
+               (expirationTime - i->second->expiretime) << " sec)");
         if (i->second->expiretime <= expirationTime) {
             debugs(29, 6, "evicting " << i->first);
             i = self->store_.erase(i); //erase advances i
         } else {
-        	++i;
+            ++i;
         }
     }
     eventAdd(self->cacheCleanupEventName.c_str(), &UserNameCache::Cleanup,
-                    self, ::Config.authenticateGCInterval, 1);
+             self, ::Config.authenticateGCInterval, 1);
 }
 
 void
@@ -80,13 +80,13 @@ UserNameCache::sortedUsersList() const
 {
     std::vector<Auth::User::Pointer> rv(size(), nullptr);
     std::transform(store_.begin(), store_.end(), rv.begin(),
-        [](StoreType::value_type v) { return v.second; }
-    );
+    [](StoreType::value_type v) { return v.second; }
+                  );
     std::sort(rv.begin(), rv.end(),
-        [](const Auth::User::Pointer &lhs, const Auth::User::Pointer &rhs) {
-            return strcmp(lhs->username(), rhs->username()) < 0;
-        }
-    );
+    [](const Auth::User::Pointer &lhs, const Auth::User::Pointer &rhs) {
+        return strcmp(lhs->username(), rhs->username()) < 0;
+    }
+             );
     return rv;
 }
 
@@ -108,3 +108,4 @@ UserNameCache::syncConfig()
 }
 
 } /* namespace Auth */
+
diff --git a/src/auth/UserNameCache.h b/src/auth/UserNameCache.h
index bf31866e9c..57e0a57e65 100644
--- a/src/auth/UserNameCache.h
+++ b/src/auth/UserNameCache.h
@@ -9,10 +9,10 @@
 #ifndef SQUID_SRC_AUTH_UERNAMECACHE_H
 #define SQUID_SRC_AUTH_UERNAMECACHE_H
 
-#include "SBufAlgos.h"
 #include "auth/User.h"
-#include "cbdata.h"
 #include "base/RunnersRegistry.h"
+#include "cbdata.h"
+#include "SBufAlgos.h"
 
 #include <unordered_map>
 
@@ -80,3 +80,4 @@ private:
 } /* namespace Auth */
 
 #endif /* SQUID_SRC_AUTH_UERNAMECACHE_H */
+
diff --git a/src/auth/basic/User.cc b/src/auth/basic/User.cc
index 11bffb10cf..c8be6cf9b0 100644
--- a/src/auth/basic/User.cc
+++ b/src/auth/basic/User.cc
@@ -92,3 +92,4 @@ Auth::Basic::User::addToNameCache()
 {
     Cache()->insert(this);
 }
+
diff --git a/src/auth/digest/Scheme.cc b/src/auth/digest/Scheme.cc
index 880710d498..dbc1c22341 100644
--- a/src/auth/digest/Scheme.cc
+++ b/src/auth/digest/Scheme.cc
@@ -49,3 +49,4 @@ Auth::Digest::Scheme::createConfig()
     Auth::Digest::Config *digestCfg = new Auth::Digest::Config;
     return dynamic_cast<Auth::Config*>(digestCfg);
 }
+
diff --git a/src/auth/digest/User.cc b/src/auth/digest/User.cc
index 21d833b49c..a6d85a26df 100644
--- a/src/auth/digest/User.cc
+++ b/src/auth/digest/User.cc
@@ -85,3 +85,4 @@ Auth::Digest::User::addToNameCache()
 {
     Cache()->insert(this);
 }
+
diff --git a/src/auth/negotiate/User.cc b/src/auth/negotiate/User.cc
index 2c9af467f7..d97489c772 100644
--- a/src/auth/negotiate/User.cc
+++ b/src/auth/negotiate/User.cc
@@ -40,3 +40,4 @@ Auth::Negotiate::User::addToNameCache()
 {
     Cache()->insert(this);
 }
+
diff --git a/src/auth/ntlm/User.cc b/src/auth/ntlm/User.cc
index de3ef4cf4e..e1a96fbb30 100644
--- a/src/auth/ntlm/User.cc
+++ b/src/auth/ntlm/User.cc
@@ -40,3 +40,4 @@ Auth::Ntlm::User::addToNameCache()
 {
     Cache()->insert(this);
 }
+
diff --git a/src/auth/ntlm/User.h b/src/auth/ntlm/User.h
index 74b4c45509..d845a478bb 100644
--- a/src/auth/ntlm/User.h
+++ b/src/auth/ntlm/User.h
@@ -40,3 +40,4 @@ public:
 } // namespace Auth
 
 #endif /* _SQUID_AUTH_NTLM_USER_H */
+
diff --git a/src/auth/ntlm/UserRequest.cc b/src/auth/ntlm/UserRequest.cc
index cc3b79eb4e..f223e89f65 100644
--- a/src/auth/ntlm/UserRequest.cc
+++ b/src/auth/ntlm/UserRequest.cc
@@ -11,8 +11,8 @@
 #include "auth/ntlm/Config.h"
 #include "auth/ntlm/User.h"
 #include "auth/ntlm/UserRequest.h"
-#include "auth/UserNameCache.h"
 #include "auth/State.h"
+#include "auth/UserNameCache.h"
 #include "cbdata.h"
 #include "client_side.h"
 #include "fatal.h"