Run source maintenance script

diff --git a/src/auth/CredentialsCache.h b/src/auth/CredentialsCache.h
index b310839ae7d17bf773fe7e93609b7c3b3294a6e2..e7f392f692e6df2437ebc768ce1cebbbb8b38c9c 100644 (file)
--- a/src/auth/CredentialsCache.h
+++ b/src/auth/CredentialsCache.h
@@ -33,7 +33,6 @@ public:
     CredentialsCache(const CredentialsCache&) = delete;
     CredentialsCache& operator=(const CredentialsCache&) = delete;
 
-    /// obtain pointer to user if present, or Pointer(nullptr) if not
     /// \returns a pointer to cached credentials, or nil if none found
     Auth::User::Pointer lookup(const SBuf &userKey) const;
 
@@ -43,7 +42,7 @@ public:
     /// clear cache
     void reset() { store_.clear(); }
 
-    /// extract number of cached usernames
+    /// \returns number of cached usernames
     size_t size() const { return store_.size(); }
 
     /** periodic cleanup function, removes timed-out entries
@@ -62,7 +61,7 @@ public:
      */
     void doConfigChangeCleanup();
 
-    /// obtain alphanumerically sorted list of usernames
+    /// \returns alphanumerically sorted list of usernames
     std::vector<Auth::User::Pointer> sortedUsersList() const;
 
 private:

diff --git a/src/auth/Gadgets.cc b/src/auth/Gadgets.cc
index 857676eb101e1568d5e96e96c26484bcbbe9e731..4c23e1602931126fd7f821e31821558fb6013210 100644 (file)
--- a/src/auth/Gadgets.cc
+++ b/src/auth/Gadgets.cc
@@ -18,13 +18,13 @@
 #include "auth/AclProxyAuth.h"
 #include "auth/basic/User.h"
 #include "auth/Config.h"
+#include "auth/CredentialsCache.h"
 #include "auth/digest/User.h"
 #include "auth/Gadgets.h"
 #include "auth/negotiate/User.h"
 #include "auth/ntlm/User.h"
 #include "auth/Scheme.h"
 #include "auth/User.h"
-#include "auth/CredentialsCache.h"
 #include "auth/UserRequest.h"
 #include "client_side.h"
 #include "globals.h"

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 68c39c6200c3b98b2a77e0be9616b5f4138a7d7b..5c2c7974875147c0a79bc45aadb31bb0ac51dee0 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -21,6 +21,8 @@ libauth_la_SOURCES = \
        Type.cc \
        Config.cc \
        Config.h \
+       CredentialsCache.h \
+       CredentialsCache.cc \
        CredentialState.cc \
        CredentialState.h \
        Gadgets.cc \
@@ -32,8 +34,6 @@ libauth_la_SOURCES = \
        State.cc \
        User.h \
        User.cc \
-       CredentialsCache.h \
-       CredentialsCache.cc \
        UserRequest.h \
        UserRequest.cc
 

diff --git a/src/auth/User.cc b/src/auth/User.cc
index b7a0606ee1693e5a909ef625ab050fd78674ebe6..b92692459ba18273b053bd0f2499e4f67f3fd13c 100644 (file)
--- a/src/auth/User.cc
+++ b/src/auth/User.cc
@@ -12,9 +12,9 @@
 #include "acl/Acl.h"
 #include "acl/Gadgets.h"
 #include "auth/Config.h"
+#include "auth/CredentialsCache.h"
 #include "auth/Gadgets.h"
 #include "auth/User.h"
-#include "auth/CredentialsCache.h"
 #include "auth/UserRequest.h"
 #include "event.h"
 #include "globals.h"

diff --git a/src/auth/basic/Config.cc b/src/auth/basic/Config.cc
index d62e093fc669f483924bc1565a1561bc0f60ff5f..09b7e8ba95c4130a16587b46844aa7c51719ef88 100644 (file)
--- a/src/auth/basic/Config.cc
+++ b/src/auth/basic/Config.cc
@@ -17,9 +17,9 @@
 #include "auth/basic/Scheme.h"
 #include "auth/basic/User.h"
 #include "auth/basic/UserRequest.h"
+#include "auth/CredentialsCache.h"
 #include "auth/Gadgets.h"
 #include "auth/State.h"
-#include "auth/CredentialsCache.h"
 #include "cache_cf.h"
 #include "charset.h"
 #include "helper.h"

diff --git a/src/auth/digest/Config.cc b/src/auth/digest/Config.cc
index eea2f30d3d2b49bce01e92143785b6e5e2dfe815..d5d88a28d999356ff442bc711e6e28a61265ebdb 100644 (file)
--- a/src/auth/digest/Config.cc
+++ b/src/auth/digest/Config.cc
@@ -13,13 +13,13 @@
  * See acl.c for access control and client_side.c for auditing */
 
 #include "squid.h"
+#include "auth/CredentialsCache.h"
 #include "auth/digest/Config.h"
 #include "auth/digest/Scheme.h"
 #include "auth/digest/User.h"
 #include "auth/digest/UserRequest.h"
 #include "auth/Gadgets.h"
 #include "auth/State.h"
-#include "auth/CredentialsCache.h"
 #include "base/LookupTable.h"
 #include "base64.h"
 #include "cache_cf.h"

diff --git a/src/auth/digest/User.cc b/src/auth/digest/User.cc
index a9e6f53cf1764d79fd485f7d67649047d30ea0a2..86787d6df187b8ce61e509cd648f494d24a6c59d 100644 (file)
--- a/src/auth/digest/User.cc
+++ b/src/auth/digest/User.cc
@@ -7,9 +7,9 @@
  */
 
 #include "squid.h"
+#include "auth/CredentialsCache.h"
 #include "auth/digest/Config.h"
 #include "auth/digest/User.h"
-#include "auth/CredentialsCache.h"
 #include "Debug.h"
 #include "dlink.h"
 #include "SquidConfig.h"

diff --git a/src/auth/negotiate/User.cc b/src/auth/negotiate/User.cc
index fa07371236164a7b03af4acf537269bc6b77e34c..0c38696d50ce602e418c97b7b6c165b3b1dba07a 100644 (file)
--- a/src/auth/negotiate/User.cc
+++ b/src/auth/negotiate/User.cc
@@ -8,8 +8,8 @@
 
 #include "squid.h"
 #include "auth/Config.h"
-#include "auth/negotiate/User.h"
 #include "auth/CredentialsCache.h"
+#include "auth/negotiate/User.h"
 #include "Debug.h"
 
 Auth::Negotiate::User::User(Auth::Config *aConfig, const char *aRequestRealm) :

diff --git a/src/auth/negotiate/UserRequest.cc b/src/auth/negotiate/UserRequest.cc
index 165d970a7fffdda35125106d79cef14fc0c1f2c2..f68b1acf20ee2a3f31edd81087e12363d10b43fe 100644 (file)
--- a/src/auth/negotiate/UserRequest.cc
+++ b/src/auth/negotiate/UserRequest.cc
@@ -8,12 +8,12 @@
 
 #include "squid.h"
 #include "AccessLogEntry.h"
+#include "auth/CredentialsCache.h"
 #include "auth/negotiate/Config.h"
 #include "auth/negotiate/User.h"
 #include "auth/negotiate/UserRequest.h"
 #include "auth/State.h"
 #include "auth/User.h"
-#include "auth/CredentialsCache.h"
 #include "client_side.h"
 #include "fatal.h"
 #include "format/Format.h"

diff --git a/src/auth/ntlm/User.cc b/src/auth/ntlm/User.cc
index d006f6243ed58b5d38bb27342efb06c1765ed885..797d5cb69b6d10f180c6be0f2e8be75082dd5982 100644 (file)
--- a/src/auth/ntlm/User.cc
+++ b/src/auth/ntlm/User.cc
@@ -8,8 +8,8 @@
 
 #include "squid.h"
 #include "auth/Config.h"
-#include "auth/ntlm/User.h"
 #include "auth/CredentialsCache.h"
+#include "auth/ntlm/User.h"
 #include "Debug.h"
 
 Auth::Ntlm::User::User(Auth::Config *aConfig, const char *aRequestRealm) :

diff --git a/src/auth/ntlm/UserRequest.cc b/src/auth/ntlm/UserRequest.cc
index cf732da6eab45e368f328441fc87569bf263207d..56ff8fb8cef413e340b352ea45bdde168e1964db 100644 (file)
--- a/src/auth/ntlm/UserRequest.cc
+++ b/src/auth/ntlm/UserRequest.cc
@@ -8,11 +8,11 @@
 
 #include "squid.h"
 #include "AccessLogEntry.h"
+#include "auth/CredentialsCache.h"
 #include "auth/ntlm/Config.h"
 #include "auth/ntlm/User.h"
 #include "auth/ntlm/UserRequest.h"
 #include "auth/State.h"
-#include "auth/CredentialsCache.h"
 #include "cbdata.h"
 #include "client_side.h"
 #include "fatal.h"