SourceFormat Enforcement

diff --git a/compat/compat.h b/compat/compat.h
index f9d20a8622f8a862421769a9637beadc09ed34a9..54720192bf0d18115dbc00a26621d34c4d5bb881 100644 (file)
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -76,9 +76,9 @@
 /* components as found to be needed                  */
 /*****************************************************/
 
+#include "compat/assert.h"
 #include "compat/compat_shared.h"
 #include "compat/stdvarargs.h"
-#include "compat/assert.h"
 
 /* cstdio has a bunch of problems with 64-bit definitions */
 #include "compat/stdio.h"

diff --git a/compat/compat_shared.h b/compat/compat_shared.h
index db7439a2db9dc2d2d73d036ae36c4250d57dce8f..a24043b31059694e308bc8279ddfc79034fa5485 100644 (file)
--- a/compat/compat_shared.h
+++ b/compat/compat_shared.h
@@ -208,10 +208,10 @@ extern "C" {
  * Several function definitions which we provide for security and code safety.
  */
 #include "compat/xalloc.h"
+#include "compat/xis.h"
 #include "compat/xstrerror.h"
 #include "compat/xstring.h"
 #include "compat/xstrto.h"
-#include "compat/xis.h"
 
 /*
  * strtoll() is needed. Squid provides a portable definition.

diff --git a/compat/getnameinfo.c b/compat/getnameinfo.c
index aa8716c6077195e48e39aeb6c7e370b03761db2a..cfa5433f63d2b801c0ffa10bfb8431c685d39343 100644 (file)
--- a/compat/getnameinfo.c
+++ b/compat/getnameinfo.c
@@ -75,8 +75,8 @@
 
 #if !HAVE_GETNAMEINFO
 
-#include "compat/inet_ntop.h"
 #include "compat/getaddrinfo.h"
+#include "compat/inet_ntop.h"
 
 #if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>

diff --git a/helpers/basic_auth/MSNT/allowusers.cc b/helpers/basic_auth/MSNT/allowusers.cc
index ff417e8839b58327aad105f0c3914fdd2393dd0e..32f09a4ca88edd9a1d06160e88edec7641943d11 100644 (file)
--- a/helpers/basic_auth/MSNT/allowusers.cc
+++ b/helpers/basic_auth/MSNT/allowusers.cc
@@ -15,8 +15,8 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <string.h>
-#include "usersfile.h"
 #include "msntauth.h"
+#include "usersfile.h"
 
 static usersfile AllowUsers;
 static int init = 0;

diff --git a/helpers/basic_auth/MSNT/denyusers.cc b/helpers/basic_auth/MSNT/denyusers.cc
index ddc995b442414c5e0acd252b00cb7a9d034aa266..c1d7cc00a7fe8d4c51ee0fbaa6379c0d761d827f 100644 (file)
--- a/helpers/basic_auth/MSNT/denyusers.cc
+++ b/helpers/basic_auth/MSNT/denyusers.cc
@@ -16,8 +16,8 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <string.h>
-#include "usersfile.h"
 #include "msntauth.h"
+#include "usersfile.h"
 
 static usersfile DenyUsers;
 static int init = 0;

diff --git a/helpers/basic_auth/NCSA/crypt_md5.cc b/helpers/basic_auth/NCSA/crypt_md5.cc
index 1890d4eda5eebfb6e71ca1dcd7fd688ce85e92b7..5390d746f458ba47aecf2a7a662e0ad984df4e65 100644 (file)
--- a/helpers/basic_auth/NCSA/crypt_md5.cc
+++ b/helpers/basic_auth/NCSA/crypt_md5.cc
@@ -23,8 +23,8 @@
 #include <stdio.h>
 #endif
 
-#include "md5.h"
 #include "crypt_md5.h"
+#include "md5.h"
 
 static unsigned char itoa64[] =        /* 0 ... 63 => ascii - 64 */
     "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";

diff --git a/helpers/basic_auth/RADIUS/basic_radius_auth.cc b/helpers/basic_auth/RADIUS/basic_radius_auth.cc
index 0672a1e644feb11109f7b65b1bd15bc3dc59d78e..4b8f7dac4e648805f057cbd11956f06b96ee96b9 100644 (file)
--- a/helpers/basic_auth/RADIUS/basic_radius_auth.cc
+++ b/helpers/basic_auth/RADIUS/basic_radius_auth.cc
@@ -48,8 +48,8 @@
 #include "squid.h"
 #include "helpers/defines.h"
 #include "md5.h"
-#include "radius.h"
 #include "radius-util.h"
+#include "radius.h"
 
 #if HAVE_SYS_SOCKET_H
 #include <sys/socket.h>

diff --git a/helpers/digest_auth/LDAP/digest_common.h b/helpers/digest_auth/LDAP/digest_common.h
index 039108e76c2f54bda08a41996e5a7442e3584f98..8834eabd706b369e4ead9295e30f5a099f21dc05 100644 (file)
--- a/helpers/digest_auth/LDAP/digest_common.h
+++ b/helpers/digest_auth/LDAP/digest_common.h
@@ -36,9 +36,9 @@
 #include <crypt.h>
 #endif
 
-#include "util.h"
 #include "hash.h"
 #include "rfc2617.h"
+#include "util.h"
 
 typedef struct _request_data {
     char *user;

diff --git a/helpers/digest_auth/eDirectory/digest_common.h b/helpers/digest_auth/eDirectory/digest_common.h
index 6f1bb672e119d9baa48f1c3c6cec7ecff169dcdb..02ac4225c5ad5c6e5c926e35d2644fa7e8730344 100644 (file)
--- a/helpers/digest_auth/eDirectory/digest_common.h
+++ b/helpers/digest_auth/eDirectory/digest_common.h
@@ -39,9 +39,9 @@
 #include <crypt.h>
 #endif
 
-#include "util.h"
 #include "hash.h"
 #include "rfc2617.h"
+#include "util.h"
 
 typedef struct _request_data {
     char *user;

diff --git a/helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc b/helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc
index 8867366de44b49248f14212a2dbc7170559bc4e5..08bdb97d44e4650bb16bc48c650a8dbd6cdfae9a 100644 (file)
--- a/helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc
+++ b/helpers/external_acl/kerberos_ldap_group/kerberos_ldap_group.cc
@@ -31,8 +31,8 @@
  */
 #include "squid.h"
 #include "helpers/defines.h"
-#include "util.h"
 #include "rfc1738.h"
+#include "util.h"
 
 #ifdef HAVE_LDAP
 

diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos.h b/helpers/negotiate_auth/kerberos/negotiate_kerberos.h
index 49ead4ed4cf56df7f219c8d7751b4a5fb2adb925..0743d81ecec122c17a7497a48d6d0f7b61d41705 100644 (file)
--- a/helpers/negotiate_auth/kerberos/negotiate_kerberos.h
+++ b/helpers/negotiate_auth/kerberos/negotiate_kerberos.h
@@ -43,8 +43,8 @@
 #include <time.h>
 #endif
 
-#include "util.h"
 #include "base64.h"
+#include "util.h"
 
 #if HAVE_KRB5_H
 #if HAVE_BROKEN_SOLARIS_KRB5_H

diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc
index 7668ac0abaac1b313db8bb8a70f005dd3293e175..511e862458950fb18f7f47a51b57d052268b1e5a 100644 (file)
--- a/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc
+++ b/helpers/negotiate_auth/kerberos/negotiate_kerberos_auth.cc
@@ -30,9 +30,9 @@
  * Hosted at http://sourceforge.net/projects/squidkerbauth
  */
 #include "squid.h"
-#include "rfc1738.h"
 #include "compat/getaddrinfo.h"
 #include "compat/getnameinfo.h"
+#include "rfc1738.h"
 
 #if HAVE_GSSAPI
 

diff --git a/helpers/negotiate_auth/kerberos/negotiate_kerberos_pac.cc b/helpers/negotiate_auth/kerberos/negotiate_kerberos_pac.cc
index 27901ef5fcec3366baabbed73042492e6d729f17..29382a9cd5bd1bfaf3d00f105589347883f1483d 100644 (file)
--- a/helpers/negotiate_auth/kerberos/negotiate_kerberos_pac.cc
+++ b/helpers/negotiate_auth/kerberos/negotiate_kerberos_pac.cc
@@ -28,9 +28,9 @@
  */
 
 #include "squid.h"
-#include "rfc1738.h"
 #include "compat/getaddrinfo.h"
 #include "compat/getnameinfo.h"
+#include "rfc1738.h"
 
 #include "negotiate_kerberos.h"
 

diff --git a/include/cache_snmp.h b/include/cache_snmp.h
index c1544cf0165a1435f9a153cbd27a1cfd90dd709c..ffdea6759d65d31454da456bdfb4a7f5df8b3352 100644 (file)
--- a/include/cache_snmp.h
+++ b/include/cache_snmp.h
@@ -10,8 +10,8 @@ typedef int64_t snint;
 #endif
 
 #include "snmp.h"
-#include "snmp_impl.h"
 #include "snmp_api.h"
+#include "snmp_impl.h"
 
 /* MIB definitions
  * SQUID-MIB

diff --git a/include/snmp.h b/include/snmp.h
index d79738bbfda5d1864b718d0d72148c2a65432a8e..e0423156188df456cf7b663b57100af893c32be7 100644 (file)
--- a/include/snmp.h
+++ b/include/snmp.h
@@ -43,20 +43,20 @@
 #include "snmp_session.h"
 
 /* The various modules */
-#include "snmp_vars.h"
-#include "snmp_pdu.h"
 #include "snmp_msg.h"
+#include "snmp_pdu.h"
+#include "snmp_vars.h"
 
 /* Other functions */
+#include "snmp_api_error.h"
 #include "snmp_coexist.h"
-#include "version.h"
 #include "snmp_error.h"
-#include "snmp_api_error.h"
+#include "version.h"
 /* Other stuff I didn't touch */
-#include "snmp_impl.h"
-#include "snmp_api.h"
-#include "snmp-internal.h"
 #include "parse.h"
+#include "snmp-internal.h"
+#include "snmp_api.h"
 #include "snmp_debug.h"
+#include "snmp_impl.h"
 
 #endif /* SQUID_SNMP_H */

diff --git a/lib/libTrie/Trie.cc b/lib/libTrie/Trie.cc
index f5e3f399d5071ff79c139713f9128709e7305005..32e39afa6c8dc9cb16afee02366d62add72cd60d 100644 (file)
--- a/lib/libTrie/Trie.cc
+++ b/lib/libTrie/Trie.cc
@@ -22,8 +22,8 @@
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#include "TrieNode.h"
 #include "TrieCharTransform.h"
+#include "TrieNode.h"
 
 #if !_USE_INLINE_
 #include "Trie.cci"

diff --git a/lib/libTrie/TrieNode.cc b/lib/libTrie/TrieNode.cc
index 60fbf54cf78885b3fc6beb8c4d4694ac135c45f0..a641444697ec3028beef233ade34abee8940667c 100644 (file)
--- a/lib/libTrie/TrieNode.cc
+++ b/lib/libTrie/TrieNode.cc
@@ -18,8 +18,8 @@
  */
 
 #include "squid.h"
-#include "TrieNode.h"
 #include "TrieCharTransform.h"
+#include "TrieNode.h"
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/lib/libTrie/TrieNode.cci b/lib/libTrie/TrieNode.cci
index c5f36e46bb6ea7f5f5a0b01e4933070f8c2141f6..882914eab3ac8579c281d6cd2b9a57079762cb2b 100644 (file)
--- a/lib/libTrie/TrieNode.cci
+++ b/lib/libTrie/TrieNode.cci
@@ -18,8 +18,8 @@
  */
 
 #ifdef __cplusplus
-#include "TrieNode.h"
 #include "TrieCharTransform.h"
+#include "TrieNode.h"
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif

diff --git a/lib/rfc2617.c b/lib/rfc2617.c
index 06108bd9e4f0c6a05f8bb3778261b8acf347a703..c586c2343070f8cb1eac89401e3416265f9e053b 100644 (file)
--- a/lib/rfc2617.c
+++ b/lib/rfc2617.c
@@ -45,8 +45,8 @@
 
 #include "squid.h"
 #include <string.h>
-#include "rfc2617.h"
 #include "md5.h"
+#include "rfc2617.h"
 
 void
 CvtHex(const HASH Bin, HASHHEX Hex)

diff --git a/lib/rfc2671.c b/lib/rfc2671.c
index b53a238e3a218a9ef9379a89b516b5f841dc5173..06af87b4b7f6f4877079e689d613885999ef63bc 100644 (file)
--- a/lib/rfc2671.c
+++ b/lib/rfc2671.c
@@ -1,6 +1,6 @@
 #include "squid.h"
-#include "rfc2671.h"
 #include "rfc1035.h"
+#include "rfc2671.h"
 
 int
 rfc2671RROptPack(char *buf, size_t sz, ssize_t edns_sz)

diff --git a/lib/rfc3596.c b/lib/rfc3596.c
index b3d39e028d65c7a569867bac684ca9df2912e283..7d4a2a222632cb2c1a8a3ef7c43c7ba82d22aec8 100644 (file)
--- a/lib/rfc3596.c
+++ b/lib/rfc3596.c
@@ -76,8 +76,8 @@
 #include <strings.h>
 #endif
 
-#include "rfc3596.h"
 #include "rfc2671.h"
+#include "rfc3596.h"
 
 #ifndef SQUID_RFC1035_H
 #error RFC3596 Library depends on RFC1035

diff --git a/lib/smblib/bad-chain.c b/lib/smblib/bad-chain.c
index 4b7b237a2a6eadb495567b0781b05c316713e279..096db453811d80d076473fb8e4965ad95b9e4563 100644 (file)
--- a/lib/smblib/bad-chain.c
+++ b/lib/smblib/bad-chain.c
@@ -24,8 +24,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "smblib/smblib-priv.h"
 #include "rfcnb/rfcnb.h"
+#include "smblib/smblib-priv.h"
 
 #include <signal.h>
 #if HAVE_STRING_H

diff --git a/lib/smblib/exper.c b/lib/smblib/exper.c
index a67de30a28449370b05a8ee45cfd98ca13d12be3..0ce10b67d1bc893cb7fdfbc3f3f8849b9a560bc9 100644 (file)
--- a/lib/smblib/exper.c
+++ b/lib/smblib/exper.c
@@ -24,8 +24,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "smblib/smblib-priv.h"
 #include "rfcnb/rfcnb.h"
+#include "smblib/smblib-priv.h"
 
 #include <signal.h>
 #if HAVE_STRING_H

diff --git a/lib/smblib/file.c b/lib/smblib/file.c
index 47abdca38344c819eb71f1295e2efb9c27e6f0cd..afd7cf3401f705a894702e43d317108d751380d6 100644 (file)
--- a/lib/smblib/file.c
+++ b/lib/smblib/file.c
@@ -24,8 +24,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "smblib/smblib-priv.h"
 #include "rfcnb/rfcnb.h"
+#include "smblib/smblib-priv.h"
 
 #if HAVE_STRING_H
 #include <string.h>

diff --git a/lib/smblib/smblib-api.c b/lib/smblib/smblib-api.c
index 2496d867b41570f5eddfc8bfd35ae1c46398af5d..ea628ab749d5f1d91c78afed5a281ad6c89ed94d 100644 (file)
--- a/lib/smblib/smblib-api.c
+++ b/lib/smblib/smblib-api.c
@@ -24,8 +24,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "smblib/smblib-priv.h"
 #include "rfcnb/rfcnb.h"
+#include "smblib/smblib-priv.h"
 
 #if HAVE_STRING_H
 #include <string.h>

diff --git a/lib/smblib/smblib-priv.h b/lib/smblib/smblib-priv.h
index 5640da5efb9c8a4e0b9e204aaa243a049d54cac4..ebb261fa1338ef934ce4700f6c58f60495500457 100644 (file)
--- a/lib/smblib/smblib-priv.h
+++ b/lib/smblib/smblib-priv.h
@@ -26,8 +26,8 @@
 #ifndef _SMBLIB_PRIV_H_
 #define _SMBLIB_PRIV_H_
 
-#include "smblib/std-defines.h"
 #include "smblib/smblib-common.h"
+#include "smblib/std-defines.h"
 #include <sys/types.h>
 #include <unistd.h>
 

diff --git a/lib/smblib/smblib-util.c b/lib/smblib/smblib-util.c
index 893ab7d77c458a62d65b8f0d3db4608390a2e714..ee05a006710dd3fcd5d8e0fbf16290942bba2a69 100644 (file)
--- a/lib/smblib/smblib-util.c
+++ b/lib/smblib/smblib-util.c
@@ -25,9 +25,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "smblib/smblib.h"
-#include "smblib/smblib-priv.h"
 #include "rfcnb/rfcnb.h"
+#include "smblib/smblib-priv.h"
+#include "smblib/smblib.h"
 
 #if HAVE_STRING_H
 #include <string.h>

diff --git a/lib/smblib/smblib.c b/lib/smblib/smblib.c
index 7eade4fc6c6493343a0546199769f41eafdb40f1..3a2fd54158aa1673b24d2bf98e6fd5d5af311bef 100644 (file)
--- a/lib/smblib/smblib.c
+++ b/lib/smblib/smblib.c
@@ -29,9 +29,9 @@ int SMBlib_errno;
 int SMBlib_SMB_Error;
 #define SMBLIB_ERRNO
 
-#include "smblib/smblib.h"
-#include "smblib/smblib-priv.h"
 #include "rfcnb/rfcnb.h"
+#include "smblib/smblib-priv.h"
+#include "smblib/smblib.h"
 
 #include <signal.h>
 #if HAVE_STRING_H

diff --git a/lib/smblib/smblib.h b/lib/smblib/smblib.h
index aa501f4230680d50ac578a23c11c88f6618edff7..4e6ae003009cf4cb45f9e8ad980de08bed25240d 100644 (file)
--- a/lib/smblib/smblib.h
+++ b/lib/smblib/smblib.h
@@ -26,9 +26,9 @@
 #ifndef _SMBLIB_SMBLIB_H
 #define _SMBLIB_SMBLIB_H
 
-#include "std-defines.h"
 #include "smblib-common.h"
 #include "smblib/smbencrypt.h"
+#include "std-defines.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/snmplib/coexistance.c b/snmplib/coexistance.c
index dc97168b51c8172031f657d8ddab054ebcfce563..dd8e209b60baab55096e7ef010c81884a08a6f26 100644 (file)
--- a/snmplib/coexistance.c
+++ b/snmplib/coexistance.c
@@ -76,12 +76,12 @@
 #include <netdb.h>
 #endif
 
-#include "snmp.h"
 #include "asn1.h"
-#include "snmp_vars.h"
-#include "snmp_pdu.h"
-#include "snmp_error.h"
+#include "snmp.h"
 #include "snmp_api_error.h"
+#include "snmp_error.h"
+#include "snmp_pdu.h"
+#include "snmp_vars.h"
 
 #include "util.h"
 

diff --git a/snmplib/mib.c b/snmplib/mib.c
index 22dbe1da4fdc3f119f6d97f48f177eed0213278b..707f307f7aa28ef83d8bf7b91013fe3b9559e813 100644 (file)
--- a/snmplib/mib.c
+++ b/snmplib/mib.c
@@ -74,12 +74,12 @@ SOFTWARE.
 #include "asn1.h"
 #include "snmp.h"
 
+#include "parse.h"
+#include "snmp_api.h"
+#include "snmp_impl.h"
 #include "snmp_pdu.h"
-#include "snmp_vars.h"
 #include "snmp_session.h"
-#include "snmp_impl.h"
-#include "snmp_api.h"
-#include "parse.h"
+#include "snmp_vars.h"
 
 #include "util.h"
 

diff --git a/snmplib/snmp_api.c b/snmplib/snmp_api.c
index e587a516149a8dac59b5366a4754066520315026..ba6703d0f73c7b9e68536421ea1dfbef840ed7e3 100644 (file)
--- a/snmplib/snmp_api.c
+++ b/snmplib/snmp_api.c
@@ -76,12 +76,12 @@
 #include "snmp.h"
 
 #include "snmp-internal.h"
+#include "snmp_error.h"
 #include "snmp_impl.h"
+#include "snmp_msg.h"
+#include "snmp_pdu.h"
 #include "snmp_session.h"
-#include "snmp_error.h"
 #include "snmp_vars.h"
-#include "snmp_pdu.h"
-#include "snmp_msg.h"
 
 #include "snmp_api.h"
 #include "snmp_api_error.h"

diff --git a/snmplib/snmp_msg.c b/snmplib/snmp_msg.c
index 623c81090f537541546ea00f260db489a2dce819..985ad43b015cd6999a8b379d8ff62e79c5366f81 100644 (file)
--- a/snmplib/snmp_msg.c
+++ b/snmplib/snmp_msg.c
@@ -82,11 +82,11 @@
 #include <netdb.h>
 #endif
 
-#include "snmp.h"
 #include "asn1.h"
-#include "snmp_vars.h"
-#include "snmp_pdu.h"
+#include "snmp.h"
 #include "snmp_msg.h"
+#include "snmp_pdu.h"
+#include "snmp_vars.h"
 
 /*
  * RFC 1901: Introduction to Community-based SNMPv2

diff --git a/snmplib/snmp_pdu.c b/snmplib/snmp_pdu.c
index d5b4d4fdff26aa3643892a12c581197b7b237d8b..44a4d25715d8ca3fbe951eba873a8e6cde47e509 100644 (file)
--- a/snmplib/snmp_pdu.c
+++ b/snmplib/snmp_pdu.c
@@ -82,13 +82,13 @@
 #include <netdb.h>
 #endif
 
-#include "snmp.h"
 #include "asn1.h"
+#include "snmp.h"
+#include "snmp_api_error.h"
 #include "snmp_error.h"
-#include "snmp_vars.h"
-#include "snmp_pdu.h"
 #include "snmp_msg.h"
-#include "snmp_api_error.h"
+#include "snmp_pdu.h"
+#include "snmp_vars.h"
 
 #include "util.h"
 

diff --git a/snmplib/snmp_vars.c b/snmplib/snmp_vars.c
index 0ace96c1ed829e4aa02384244ac63a605ff99063..a05f14d3735890e0169851a8715a5481efc128bb 100644 (file)
--- a/snmplib/snmp_vars.c
+++ b/snmplib/snmp_vars.c
@@ -81,15 +81,15 @@
 #include <netdb.h>
 #endif
 
-#include "snmp.h"
 #include "asn1.h"
+#include "snmp.h"
 #include "snmp_vars.h"
 #if 0
 #include "mibii.h"
 #endif
 #include "snmp_api_error.h"
-#include "snmp_pdu.h"
 #include "snmp_msg.h"
+#include "snmp_pdu.h"
 
 #include "util.h"
 

diff --git a/src/AccessLogEntry.h b/src/AccessLogEntry.h
index 698a41c5b09887baf0c449cc7097c2153c28e82b..b3c4908ae3f4c9d9f7fb8ebfb3d66078c4654813 100644 (file)
--- a/src/AccessLogEntry.h
+++ b/src/AccessLogEntry.h
@@ -33,10 +33,10 @@
 #include "anyp/PortCfg.h"
 #include "base/RefCount.h"
 #include "comm/Connection.h"
-#include "HttpHeader.h"
+#include "HierarchyLogEntry.h"
 #include "http/ProtocolVersion.h"
+#include "HttpHeader.h"
 #include "HttpRequestMethod.h"
-#include "HierarchyLogEntry.h"
 #include "icp_opcode.h"
 #include "ip/Address.h"
 #include "LogTags.h"

diff --git a/src/AclRegs.cc b/src/AclRegs.cc
index cd7387497c776da571955ff249931eb2653198d7..e44bdc6cd0c241916e3a610f017365e552de5e3c 100644 (file)
--- a/src/AclRegs.cc
+++ b/src/AclRegs.cc
@@ -24,8 +24,8 @@
 #endif
 #include "acl/FilledChecklist.h"
 #include "acl/Gadgets.h"
-#include "acl/HierCodeData.h"
 #include "acl/HierCode.h"
+#include "acl/HierCodeData.h"
 #include "acl/HttpHeaderData.h"
 #include "acl/HttpRepHeader.h"
 #include "acl/HttpReqHeader.h"
@@ -35,14 +35,14 @@
 #include "acl/LocalIp.h"
 #include "acl/LocalPort.h"
 #include "acl/MaxConnection.h"
-#include "acl/MethodData.h"
 #include "acl/Method.h"
+#include "acl/MethodData.h"
 #include "acl/MyPortName.h"
 #include "acl/Note.h"
 #include "acl/NoteData.h"
 #include "acl/PeerName.h"
-#include "acl/ProtocolData.h"
 #include "acl/Protocol.h"
+#include "acl/ProtocolData.h"
 #include "acl/Random.h"
 #include "acl/Referer.h"
 #include "acl/RegexData.h"
@@ -54,10 +54,10 @@
 #include "acl/SourceDomain.h"
 #include "acl/SourceIp.h"
 #if USE_SSL
-#include "acl/SslErrorData.h"
-#include "acl/SslError.h"
-#include "acl/CertificateData.h"
 #include "acl/Certificate.h"
+#include "acl/CertificateData.h"
+#include "acl/SslError.h"
+#include "acl/SslErrorData.h"
 #endif
 #include "acl/Strategised.h"
 #include "acl/Strategy.h"
@@ -66,16 +66,16 @@
 #include "acl/ServerCertificate.h"
 #endif
 #include "acl/Tag.h"
-#include "acl/TimeData.h"
 #include "acl/Time.h"
+#include "acl/TimeData.h"
 #include "acl/Url.h"
 #include "acl/UrlLogin.h"
 #include "acl/UrlPath.h"
 #include "acl/UrlPort.h"
 #include "acl/UserData.h"
 #if USE_AUTH
-#include "auth/AclProxyAuth.h"
 #include "auth/AclMaxUserIp.h"
+#include "auth/AclProxyAuth.h"
 #endif
 #if USE_IDENT
 #include "ident/AclIdent.h"

diff --git a/src/BodyPipe.h b/src/BodyPipe.h
index 2894c0643ff14ea4dd84f49b4d19de22a3ec71d2..40182054320bbfe7ecea27e6658b46ee10eab091 100644 (file)
--- a/src/BodyPipe.h
+++ b/src/BodyPipe.h
@@ -1,9 +1,9 @@
 #ifndef SQUID_BODY_PIPE_H
 #define SQUID_BODY_PIPE_H
 
-#include "MemBuf.h"
 #include "base/AsyncJob.h"
 #include "base/CbcPointer.h"
+#include "MemBuf.h"
 
 class BodyPipe;
 

diff --git a/src/ChunkedCodingParser.cc b/src/ChunkedCodingParser.cc
index db8c5f375c2ec93a3a6996a344b2ac3453bd2578..f9ab4ab92df0b92f54145dfce583f06c77955429 100644 (file)
--- a/src/ChunkedCodingParser.cc
+++ b/src/ChunkedCodingParser.cc
@@ -1,9 +1,9 @@
 #include "squid.h"
 #include "base/TextException.h"
-#include "Debug.h"
-#include "Parsing.h"
 #include "ChunkedCodingParser.h"
+#include "Debug.h"
 #include "MemBuf.h"
+#include "Parsing.h"
 
 ChunkedCodingParser::Step ChunkedCodingParser::psChunkSize = &ChunkedCodingParser::parseChunkSize;
 ChunkedCodingParser::Step ChunkedCodingParser::psUnusedChunkExtension = &ChunkedCodingParser::parseUnusedChunkExtension;

diff --git a/src/ClientInfo.h b/src/ClientInfo.h
index 3108e2cf76baf2d36f4eff7cbc2b8bf324878b5d..07f7e902203a2faa6529a7346a993338b2a4ab81 100644 (file)
--- a/src/ClientInfo.h
+++ b/src/ClientInfo.h
@@ -1,12 +1,12 @@
 #ifndef SQUID__SRC_CLIENTINFO_H
 #define SQUID__SRC_CLIENTINFO_H
 
-#include "ip/Address.h"
+#include "cbdata.h"
+#include "enums.h"
 #include "hash.h"
+#include "ip/Address.h"
 #include "LogTags.h"
-#include "enums.h"
 #include "typedefs.h"
-#include "cbdata.h"
 #include <deque>
 
 #if USE_DELAY_POOLS

diff --git a/src/CommCalls.h b/src/CommCalls.h
index 5003e78faa4e4b31cbb5b4097c62c5c7012c4667..9ec9f4ff6674d2a801ab4a692995cc400674725d 100644 (file)
--- a/src/CommCalls.h
+++ b/src/CommCalls.h
@@ -3,8 +3,8 @@
 
 #include "base/AsyncCall.h"
 #include "base/AsyncJobCalls.h"
-#include "comm_err_t.h"
 #include "comm/forward.h"
+#include "comm_err_t.h"
 #include "MasterXaction.h"
 
 /* CommCalls implement AsyncCall interface for comm_* callbacks.

diff --git a/src/CommRead.h b/src/CommRead.h
index 7a6cd8701d534cf9e4464f9a076422ed57df8055..210d73919797c0e702e332818988c6858eaa0eaf 100644 (file)
--- a/src/CommRead.h
+++ b/src/CommRead.h
@@ -34,10 +34,10 @@
 #ifndef COMMREAD_H
 #define COMMREAD_H
 
+#include "CbDataList.h"
 #include "comm.h"
-#include "CommCalls.h"
 #include "comm/forward.h"
-#include "CbDataList.h"
+#include "CommCalls.h"
 
 class CommRead
 {

diff --git a/src/CommonPool.h b/src/CommonPool.h
index af04d37012aae8d9490f092c15fd55bbdefa94e2..19ff567823295e2135a8abcad56712b4225979a8 100644 (file)
--- a/src/CommonPool.h
+++ b/src/CommonPool.h
@@ -37,8 +37,8 @@
 #define COMMONPOOL_H
 
 #if USE_DELAY_POOLS
-#include "SquidString.h"
 #include "CompositePoolNode.h"
+#include "SquidString.h"
 
 /*
  \ingroup DelayPoolsAPI

diff --git a/src/DelayPool.cc b/src/DelayPool.cc
index e064b960bbe122a06c9909791a5cf7e7c259c0eb..af6fafcc93bce6dd0d336a5c23c95a0b01573def 100644 (file)
--- a/src/DelayPool.cc
+++ b/src/DelayPool.cc
@@ -37,10 +37,10 @@
 #include "squid.h"
 
 #if USE_DELAY_POOLS
-#include "DelayPool.h"
-#include "CommonPool.h"
 #include "acl/Acl.h"
 #include "acl/Gadgets.h"
+#include "CommonPool.h"
+#include "DelayPool.h"
 #include "Store.h"
 
 DelayPool::DelayPool() : pool (NULL), access (NULL)

diff --git a/src/DelayPool.h b/src/DelayPool.h
index 36e1fc04bb39c7bc70caf56e4de3206dae1ad235..8b95b0d194427703cbc508abf1733632210d4d1e 100644 (file)
--- a/src/DelayPool.h
+++ b/src/DelayPool.h
@@ -38,8 +38,8 @@
 #define DELAYPOOL_H
 
 #if USE_DELAY_POOLS
-#include "CompositePoolNode.h"
 #include "acl/forward.h"
+#include "CompositePoolNode.h"
 
 class StoreEntry;
 

diff --git a/src/DelayTagged.h b/src/DelayTagged.h
index 342506c28953cdbe1fe58c01833c41e4c7695313..61b6e4c620ef5993ed4ca39d1150f61dc9ec1463 100644 (file)
--- a/src/DelayTagged.h
+++ b/src/DelayTagged.h
@@ -37,11 +37,11 @@
 #if USE_DELAY_POOLS
 
 #include "auth/Gadgets.h"
+#include "base/Vector.h"
 #include "CompositePoolNode.h"
-#include "DelayIdComposite.h"
 #include "DelayBucket.h"
+#include "DelayIdComposite.h"
 #include "DelaySpec.h"
-#include "base/Vector.h"
 #include "splay.h"
 
 /// \ingroup DelayPoolsAPI

diff --git a/src/DelayUser.h b/src/DelayUser.h
index 885cbbd1981e98470e8b2ef50f9fe74fab030767..6ac274791c2dada93235aef87ebfdf81320e23d7 100644 (file)
--- a/src/DelayUser.h
+++ b/src/DelayUser.h
@@ -38,11 +38,11 @@
 
 #include "auth/Gadgets.h"
 #include "auth/User.h"
+#include "base/Vector.h"
 #include "CompositePoolNode.h"
-#include "DelayIdComposite.h"
 #include "DelayBucket.h"
+#include "DelayIdComposite.h"
 #include "DelaySpec.h"
-#include "base/Vector.h"
 #include "splay.h"
 
 /// \ingroup DelayPoolsAPI

diff --git a/src/DescriptorSet.cc b/src/DescriptorSet.cc
index 05ca6232a4d570341cac745158abd6baf98cc764..67c5e51aa4187785723ecb29884c2b2fd24b3d53 100644 (file)
--- a/src/DescriptorSet.cc
+++ b/src/DescriptorSet.cc
@@ -2,8 +2,8 @@
  * DEBUG: section 05    Comm
  */
 #include "squid.h"
-#include "globals.h" /* for Squid_MaxFD */
 #include "DescriptorSet.h"
+#include "globals.h" /* for Squid_MaxFD */
 
 // pre-allocates descriptor store and index for Squid_MaxFD descriptors
 DescriptorSet::DescriptorSet(): descriptors_(NULL), index_(NULL),

diff --git a/src/DiskIO/AIO/AIODiskFile.cc b/src/DiskIO/AIO/AIODiskFile.cc
index 7a4b9df4ab19bbaae158d5a704834a934e6a76ac..b16e4dc0103c5c6d78c6b2b12c405b8f20dc0a8a 100644 (file)
--- a/src/DiskIO/AIO/AIODiskFile.cc
+++ b/src/DiskIO/AIO/AIODiskFile.cc
@@ -47,10 +47,10 @@
 #include "squid.h"
 #include "AIODiskFile.h"
 #include "AIODiskIOStrategy.h"
+#include "disk.h"
 #include "DiskIO/IORequestor.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
-#include "disk.h"
 #include "globals.h"
 
 #if HAVE_ERRNO_H

diff --git a/src/DiskIO/AIO/AIODiskFile.h b/src/DiskIO/AIO/AIODiskFile.h
index 15e052c177f299733704ebc167f903e4ab32f9de..4153645b92defa2bad6a07c38121edfcef7b38b7 100644 (file)
--- a/src/DiskIO/AIO/AIODiskFile.h
+++ b/src/DiskIO/AIO/AIODiskFile.h
@@ -33,9 +33,9 @@
 
 #if USE_DISKIO_AIO
 
-#include "DiskIO/DiskFile.h"
 #include "async_io.h"
 #include "cbdata.h"
+#include "DiskIO/DiskFile.h"
 #include "SquidString.h"
 
 class AIODiskIOStrategy;

diff --git a/src/DiskIO/AIO/AIODiskIOStrategy.cc b/src/DiskIO/AIO/AIODiskIOStrategy.cc
index 4f2b9ab667a70a0f1e8e88a7cf2c29821896ee90..21c4685c22afcce320b22b231bf968714f3442af 100644 (file)
--- a/src/DiskIO/AIO/AIODiskIOStrategy.cc
+++ b/src/DiskIO/AIO/AIODiskIOStrategy.cc
@@ -41,8 +41,8 @@
  */
 
 #include "squid.h"
-#include "AIODiskIOStrategy.h"
 #include "AIODiskFile.h"
+#include "AIODiskIOStrategy.h"
 #include "DiskIO/IORequestor.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"

diff --git a/src/DiskIO/AIO/AIODiskIOStrategy.h b/src/DiskIO/AIO/AIODiskIOStrategy.h
index e43717876ef099aab8abde03a41f2d254304c124..9bace9b294ad4c7fe31c1cadbdca162df0cca9a1 100644 (file)
--- a/src/DiskIO/AIO/AIODiskIOStrategy.h
+++ b/src/DiskIO/AIO/AIODiskIOStrategy.h
@@ -33,8 +33,8 @@
 
 #if USE_DISKIO_AIO
 
-#include "DiskIO/DiskIOStrategy.h"
 #include "async_io.h"
+#include "DiskIO/DiskIOStrategy.h"
 
 class AIODiskIOStrategy : public DiskIOStrategy
 {

diff --git a/src/DiskIO/AIO/aio_win32.cc b/src/DiskIO/AIO/aio_win32.cc
index a7504a28c4dcf1c7b39f83c6d7ff532359a8e8e9..606d2473da3fe8a27b9dc1c32ee12df2fa122eaf 100644 (file)
--- a/src/DiskIO/AIO/aio_win32.cc
+++ b/src/DiskIO/AIO/aio_win32.cc
@@ -32,8 +32,8 @@
  */
 
 #include "squid.h"
-#include "DiskIO/AIO/aio_win32.h"
 #include "comm.h"
+#include "DiskIO/AIO/aio_win32.h"
 #include "fd.h"
 #include "StatCounters.h"
 #include "win32.h"

diff --git a/src/DiskIO/Blocking/BlockingFile.cc b/src/DiskIO/Blocking/BlockingFile.cc
index d44dde48f18b86bb4ca8f78c375144851e9ea042..06ef4231e5bf6eebc83919afbfe33004d069febe 100644 (file)
--- a/src/DiskIO/Blocking/BlockingFile.cc
+++ b/src/DiskIO/Blocking/BlockingFile.cc
@@ -34,11 +34,11 @@
 #include "BlockingFile.h"
 #include "Debug.h"
 #include "defines.h"
-#include "globals.h"
+#include "disk.h"
 #include "DiskIO/IORequestor.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
-#include "disk.h"
+#include "globals.h"
 
 #if HAVE_ERRNO_H
 #include <errno.h>

diff --git a/src/DiskIO/Blocking/BlockingIOStrategy.cc b/src/DiskIO/Blocking/BlockingIOStrategy.cc
index 8bffd4f117bd75f7d7a3b491d4c7a05229059846..eaa52e46342df2b0dc53b871275571d579053e81 100644 (file)
--- a/src/DiskIO/Blocking/BlockingIOStrategy.cc
+++ b/src/DiskIO/Blocking/BlockingIOStrategy.cc
@@ -32,8 +32,8 @@
  */
 
 #include "squid.h"
-#include "BlockingIOStrategy.h"
 #include "BlockingFile.h"
+#include "BlockingIOStrategy.h"
 #include "unlinkd.h"
 
 bool

diff --git a/src/DiskIO/DiskDaemon/DiskdAction.h b/src/DiskIO/DiskDaemon/DiskdAction.h
index 6da6fd0c04b68506020ca0846416a450ce9dc0d1..8ca6230b03f4a7733ded3dd9807b8178485715e2 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskdAction.h
+++ b/src/DiskIO/DiskDaemon/DiskdAction.h
@@ -7,8 +7,8 @@
 #define SQUID_DISKD_ACTION_H
 
 #include "ipc/forward.h"
-#include "mgr/forward.h"
 #include "mgr/Action.h"
+#include "mgr/forward.h"
 
 /// store disk daemon stats
 class DiskdActionData

diff --git a/src/DiskIO/DiskDaemon/DiskdFile.cc b/src/DiskIO/DiskDaemon/DiskdFile.cc
index 4120b37e986c90662865d3fa0542e4deac5ca5a4..b3e5e57bad93dd9e30f9791b780c5d1360dd83e1 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskdFile.cc
+++ b/src/DiskIO/DiskDaemon/DiskdFile.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "DiskdFile.h"
 #include "ConfigOption.h"
 #include "diomsg.h"
+#include "DiskdFile.h"
 #include "DiskdIOStrategy.h"
 #include "DiskIO/IORequestor.h"
 #include "DiskIO/ReadRequest.h"

diff --git a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
index 4ef7543e8b671be7f3a32a4f3df34a2df5cfc739..cb1a482a25a45e0fa8e974af522c8819b2d34bd4 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
+++ b/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
@@ -34,16 +34,16 @@
 #include "squid.h"
 #include "comm/Loops.h"
 #include "ConfigOption.h"
+#include "diomsg.h"
+#include "DiskdFile.h"
 #include "DiskdIOStrategy.h"
 #include "DiskIO/DiskFile.h"
-#include "DiskdFile.h"
-#include "diomsg.h"
 #include "fd.h"
-#include "Store.h"
-#include "StatCounters.h"
 #include "SquidConfig.h"
 #include "SquidIpc.h"
 #include "SquidTime.h"
+#include "StatCounters.h"
+#include "Store.h"
 #include "unlinkd.h"
 
 #if HAVE_SYS_IPC_H

diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
index bc16d41518ff5d9fc9ae7d77948729a2f2f10780..660391a970f9b9bca0b1d3240ab596536c373b45 100644 (file)
--- a/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
+++ b/src/DiskIO/DiskThreads/DiskThreadsDiskFile.cc
@@ -33,10 +33,10 @@
 
 #include "squid.h"
 #include "disk.h"
-#include "DiskThreadsDiskFile.h"
 #include "DiskIO/IORequestor.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
+#include "DiskThreadsDiskFile.h"
 #include "fd.h"
 #include "Generic.h"
 #include "globals.h"

diff --git a/src/DiskIO/DiskThreads/async_io.cc b/src/DiskIO/DiskThreads/async_io.cc
index c436e701dd11bd8eb37d5e07f3471348ef5d0b3f..60e17a1db3b80eb8165a31804197bbadab10872c 100644 (file)
--- a/src/DiskIO/DiskThreads/async_io.cc
+++ b/src/DiskIO/DiskThreads/async_io.cc
@@ -34,10 +34,10 @@
 
 #include "squid.h"
 #include "DiskThreads.h"
-#include "Store.h"
-#include "fde.h"
 #include "DiskThreadsIOStrategy.h"
+#include "fde.h"
 #include "Generic.h"
+#include "Store.h"
 
 AIOCounts squidaio_counts;
 

diff --git a/src/DiskIO/IpcIo/IpcIoFile.cc b/src/DiskIO/IpcIo/IpcIoFile.cc
index dba711984eec1b5da5076a4eab8670fcb0f04034..bdee5a3865b59018765701e3f5af4b3ac4f3641c 100644 (file)
--- a/src/DiskIO/IpcIo/IpcIoFile.cc
+++ b/src/DiskIO/IpcIo/IpcIoFile.cc
@@ -5,11 +5,11 @@
 #include "squid.h"
 #include "base/RunnersRegistry.h"
 #include "base/TextException.h"
+#include "disk.h"
 #include "DiskIO/IORequestor.h"
 #include "DiskIO/IpcIo/IpcIoFile.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
-#include "disk.h"
 #include "fd.h"
 #include "globals.h"
 #include "ipc/mem/Pages.h"

diff --git a/src/DiskIO/IpcIo/IpcIoFile.h b/src/DiskIO/IpcIo/IpcIoFile.h
index 3d1409ad2b79a874bc43f3f036dbbedba0ff4185..ed84869c2d3ab5e25098870f82dcd4405e26f2e8 100644 (file)
--- a/src/DiskIO/IpcIo/IpcIoFile.h
+++ b/src/DiskIO/IpcIo/IpcIoFile.h
@@ -5,9 +5,9 @@
 #include "cbdata.h"
 #include "DiskIO/DiskFile.h"
 #include "DiskIO/IORequestor.h"
-#include "SquidString.h"
 #include "ipc/forward.h"
 #include "ipc/mem/Page.h"
+#include "SquidString.h"
 #include <list>
 #include <map>
 #include <memory>

diff --git a/src/DiskIO/Mmapped/MmappedFile.cc b/src/DiskIO/Mmapped/MmappedFile.cc
index 314c934bdab6b4eadef34933f0980609701601d1..2c067463707b19ecf13b6b049d8728bdf991beeb 100644 (file)
--- a/src/DiskIO/Mmapped/MmappedFile.cc
+++ b/src/DiskIO/Mmapped/MmappedFile.cc
@@ -4,11 +4,11 @@
 
 #include "squid.h"
 #include "Debug.h"
+#include "disk.h"
 #include "DiskIO/IORequestor.h"
 #include "DiskIO/Mmapped/MmappedFile.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
-#include "disk.h"
 #include "globals.h"
 
 #if HAVE_SYS_MMAN_H

diff --git a/src/EventLoop.cc b/src/EventLoop.cc
index 247ada8e23001d145222f7681c672535088881d1..b74d6ef90f7a874a3e952bdde159b5e324320ca1 100644 (file)
--- a/src/EventLoop.cc
+++ b/src/EventLoop.cc
@@ -32,9 +32,9 @@
 
 #include "squid.h"
 #include "AsyncEngine.h"
+#include "base/AsyncCallQueue.h"
 #include "Debug.h"
 #include "EventLoop.h"
-#include "base/AsyncCallQueue.h"
 #include "SquidTime.h"
 
 EventLoop::EventLoop() : errcount(0), last_loop(false), timeService(NULL),

diff --git a/src/FadingCounter.cc b/src/FadingCounter.cc
index b5087bbac01040e6b2b29e6fb7db068cae264408..1dd0576fd31c3c85065cb4aa0c4afcc1b08d4134 100644 (file)
--- a/src/FadingCounter.cc
+++ b/src/FadingCounter.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
 #include "base/TextException.h"
-#include "SquidTime.h"
 #include "FadingCounter.h"
+#include "SquidTime.h"
 
 #if HAVE_MATH_H
 #include <math.h>

diff --git a/src/FwdState.cc b/src/FwdState.cc
index 2936ad20ff818d92b18414cc7851bc328a3c5f4a..2e3f1d56b4dac0b3c6310a0bce4580352fc9f9cd 100644 (file)
--- a/src/FwdState.cc
+++ b/src/FwdState.cc
@@ -36,8 +36,8 @@
 #include "acl/FilledChecklist.h"
 #include "acl/Gadgets.h"
 #include "anyp/PortCfg.h"
-#include "CachePeer.h"
 #include "CacheManager.h"
+#include "CachePeer.h"
 #include "client_side.h"
 #include "comm/Connection.h"
 #include "comm/ConnOpener.h"
@@ -74,10 +74,10 @@
 #if USE_SSL
 #include "ssl/cert_validate_message.h"
 #include "ssl/Config.h"
-#include "ssl/helper.h"
-#include "ssl/support.h"
 #include "ssl/ErrorDetail.h"
+#include "ssl/helper.h"
 #include "ssl/ServerBump.h"
+#include "ssl/support.h"
 #endif
 #if HAVE_ERRNO_H
 #include <errno.h>

diff --git a/src/FwdState.h b/src/FwdState.h
index a1b70f2a2c612319fda80175a8c7a00d9f42fc59..5472b5164be55b238ef942e3aac34a358d34d0b0 100644 (file)
--- a/src/FwdState.h
+++ b/src/FwdState.h
@@ -1,8 +1,8 @@
 #ifndef SQUID_FORWARD_H
 #define SQUID_FORWARD_H
 
-#include "base/Vector.h"
 #include "base/RefCount.h"
+#include "base/Vector.h"
 #include "comm.h"
 #include "comm/Connection.h"
 #include "err_type.h"

diff --git a/src/HelperChildConfig.cc b/src/HelperChildConfig.cc
index ba46f0411182bf140d46a1aefb6bbb96eb2ffa4b..f8359f84f483c2937550940655ef327a875ee258 100644 (file)
--- a/src/HelperChildConfig.cc
+++ b/src/HelperChildConfig.cc
@@ -2,8 +2,8 @@
 #include "cache_cf.h"
 #include "ConfigParser.h"
 #include "Debug.h"
-#include "HelperChildConfig.h"
 #include "globals.h"
+#include "HelperChildConfig.h"
 #include "Parsing.h"
 
 #include <string.h>

diff --git a/src/HelperReply.cc b/src/HelperReply.cc
index 433a9e0b69664208a601c1d1d93d5d96799db215..80857e539424258ddf44dd45c97d619e1aa5d39a 100644 (file)
--- a/src/HelperReply.cc
+++ b/src/HelperReply.cc
@@ -4,11 +4,11 @@
  */
 #include "squid.h"
 #include "ConfigParser.h"
-#include "HelperReply.h"
+#include "Debug.h"
 #include "helper.h"
+#include "HelperReply.h"
 #include "rfc1738.h"
 #include "SquidString.h"
-#include "Debug.h"
 
 HelperReply::HelperReply(char *buf, size_t len) :
         result(HelperReply::Unknown),

diff --git a/src/HierarchyLogEntry.h b/src/HierarchyLogEntry.h
index de2614ee3bd83405072da8891adc4944c2e118c1..921eb07c5fb7b87cc4507189f06619bb4b80951b 100644 (file)
--- a/src/HierarchyLogEntry.h
+++ b/src/HierarchyLogEntry.h
@@ -37,8 +37,8 @@
 #include "hier_code.h"
 #include "http/StatusCode.h"
 #include "lookup_t.h"
-#include "rfc2181.h"
 #include "PingData.h"
+#include "rfc2181.h"
 
 class HierarchyLogEntry
 {

diff --git a/src/HttpControlMsg.h b/src/HttpControlMsg.h
index 667329446c90f2d56efed1c7d5128d5637cb0654..fb3fa8e600267f97efd00007887ff8153876033b 100644 (file)
--- a/src/HttpControlMsg.h
+++ b/src/HttpControlMsg.h
@@ -1,8 +1,8 @@
 #ifndef SQUID_HTTP_CONTROL_MSG_H
 #define SQUID_HTTP_CONTROL_MSG_H
 
-#include "HttpReply.h"
 #include "base/AsyncCall.h"
+#include "HttpReply.h"
 
 class HttpControlMsg;
 

diff --git a/src/HttpHdrCc.cc b/src/HttpHdrCc.cc
index 9b2afe5a019dab287ef7b534d95e572b4c7b0a9f..a2de7e2618f91e41f51aca069e18466238530026 100644 (file)
--- a/src/HttpHdrCc.cc
+++ b/src/HttpHdrCc.cc
@@ -32,11 +32,11 @@
 
 #include "squid.h"
 #include "base/StringArea.h"
+#include "HttpHdrCc.h"
 #include "HttpHeader.h"
 #include "HttpHeaderFieldStat.h"
 #include "HttpHeaderStat.h"
 #include "HttpHeaderTools.h"
-#include "HttpHdrCc.h"
 #include "StatHist.h"
 #include "Store.h"
 #include "StrList.h"

diff --git a/src/HttpHdrCc.cci b/src/HttpHdrCc.cci
index 4256a8bfbb7bb7e2390d37f006a33e302ab64ad5..d50068390e94e3b11cb0dad7ad81091b5691fa0d 100644 (file)
--- a/src/HttpHdrCc.cci
+++ b/src/HttpHdrCc.cci
@@ -30,8 +30,8 @@
  *
  */
 
-#include "defines.h"
 #include "Debug.h"
+#include "defines.h"
 
 bool
 HttpHdrCc::isSet(http_hdr_cc_type id) const

diff --git a/src/HttpHdrRange.cc b/src/HttpHdrRange.cc
index a47fdae4a29a2e5d2d49dcee0d58e330cdfb562d..bea0c7a42c1ba4765deaa918f445a92bbb676122 100644 (file)
--- a/src/HttpHdrRange.cc
+++ b/src/HttpHdrRange.cc
@@ -32,11 +32,11 @@
  */
 
 #include "squid.h"
-#include "Store.h"
-#include "HttpHeaderRange.h"
 #include "client_side_request.h"
-#include "HttpReply.h"
+#include "HttpHeaderRange.h"
 #include "HttpHeaderTools.h"
+#include "HttpReply.h"
+#include "Store.h"
 #include "StrList.h"
 
 /*

diff --git a/src/HttpHdrScTarget.h b/src/HttpHdrScTarget.h
index 25e583d665f9c70ecc586380a19f21b4e1bfd7ae..36b3fafafa1e913040a1f6e04bcacf242af33415 100644 (file)
--- a/src/HttpHdrScTarget.h
+++ b/src/HttpHdrScTarget.h
@@ -30,9 +30,9 @@
 #ifndef SQUID_HTTPHDRSURROGATECONTROLTARGET_H
 #define SQUID_HTTPHDRSURROGATECONTROLTARGET_H
 
-#include "MemPool.h"
 #include "defines.h"
 #include "dlink.h"
+#include "MemPool.h"
 #include "SquidString.h"
 #include "typedefs.h"
 

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index 60aeb264722b21bb8ddc37fb0505fc1bd8837a80..6561001e01c00fd8c9c95314022d8b105d1d1c38 100644 (file)
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -43,11 +43,11 @@
 #include "mgr/Registration.h"
 #include "profiler/Profiler.h"
 #include "rfc1123.h"
+#include "SquidConfig.h"
+#include "SquidString.h"
 #include "StatHist.h"
 #include "Store.h"
 #include "StrList.h"
-#include "SquidConfig.h"
-#include "SquidString.h"
 #include "TimeOrTag.h"
 
 /*

diff --git a/src/HttpHeaderFieldInfo.h b/src/HttpHeaderFieldInfo.h
index 1b1900799011e043e0c66c4feb3982b1db10c7e4..f5a37a7488b076abc429aff2506e9740d733ad32 100644 (file)
--- a/src/HttpHeaderFieldInfo.h
+++ b/src/HttpHeaderFieldInfo.h
@@ -29,8 +29,8 @@
  *
  */
 
-#include "SquidString.h"
 #include "HttpHeaderFieldStat.h"
+#include "SquidString.h"
 
 /// compiled version of HttpHeaderFieldAttrs plus stats. Currently a POD.
 class HttpHeaderFieldInfo

diff --git a/src/HttpHeaderTools.cc b/src/HttpHeaderTools.cc
index 588f1c6902ef2ef76a44bd83908b6bde96e04901..6a16f03b26c72320501e6c65507a71c172c67806 100644 (file)
--- a/src/HttpHeaderTools.cc
+++ b/src/HttpHeaderTools.cc
@@ -31,15 +31,15 @@
  */
 
 #include "squid.h"
-#include "globals.h"
 #include "acl/FilledChecklist.h"
 #include "acl/Gadgets.h"
-#include "client_side_request.h"
 #include "client_side.h"
+#include "client_side_request.h"
 #include "comm/Connection.h"
 #include "compat/strtoll.h"
 #include "ConfigParser.h"
 #include "fde.h"
+#include "globals.h"
 #include "HttpHdrContRange.h"
 #include "HttpHeader.h"
 #include "HttpHeaderFieldInfo.h"

diff --git a/src/HttpMsg.h b/src/HttpMsg.h
index 829cd778c101cbfb5f8491fa554c5ab5919fab04..f20ba6838f382eb6661198ed380759eeae95830e 100644 (file)
--- a/src/HttpMsg.h
+++ b/src/HttpMsg.h
@@ -33,10 +33,10 @@
 
 #include "base/Lock.h"
 #include "BodyPipe.h"
+#include "http/ProtocolVersion.h"
+#include "http/StatusCode.h"
 #include "HttpHeader.h"
 #include "HttpRequestMethod.h"
-#include "http/StatusCode.h"
-#include "http/ProtocolVersion.h"
 
 /// common parts of HttpRequest and HttpReply
 class HttpMsg : public RefCountable

diff --git a/src/HttpReply.h b/src/HttpReply.h
index c7f3f3e3641039855929a6008c4a0a3f3ffea64b..93758fc1341708d912f75917fc2179e0d23ae3df 100644 (file)
--- a/src/HttpReply.h
+++ b/src/HttpReply.h
@@ -30,10 +30,10 @@
 #ifndef SQUID_HTTPREPLY_H
 #define SQUID_HTTPREPLY_H
 
+#include "http/StatusLine.h"
 #include "HttpBody.h"
 #include "HttpMsg.h"
 #include "HttpRequest.h"
-#include "http/StatusLine.h"
 
 void httpReplyInitModule(void);
 

diff --git a/src/ICP.h b/src/ICP.h
index 59629f44e9b735d2a87b7abf38bad7ce2ac7154f..32b8a3fc5752c4d11c7a0af1216e2849ff16b566 100644 (file)
--- a/src/ICP.h
+++ b/src/ICP.h
@@ -39,8 +39,8 @@
 #include "comm/forward.h"
 #include "icp_opcode.h"
 #include "ip/Address.h"
-#include "StoreClient.h"
 #include "LogTags.h"
+#include "StoreClient.h"
 
 class HttpRequest;
 

diff --git a/src/LeakFinder.cc b/src/LeakFinder.cc
index 62fad1d2090e342fb9fbf6e44be9ce63cbc4d9ee..60eb820b2ad4e36b907343ba8fe1d1b85cef8e4f 100644 (file)
--- a/src/LeakFinder.cc
+++ b/src/LeakFinder.cc
@@ -39,8 +39,8 @@
 #if USE_LEAKFINDER
 
 #include "LeakFinder.h"
-#include "Store.h"
 #include "SquidTime.h"
+#include "Store.h"
 
 /* ========================================================================= */
 

diff --git a/src/Notes.cc b/src/Notes.cc
index b852028f6293e10b421b97d3057506f0a0db6059..b482f4eb2050a4b2e8af8bd15aaab8c9eb5b222b 100644 (file)
--- a/src/Notes.cc
+++ b/src/Notes.cc
@@ -28,13 +28,13 @@
  */
 
 #include "squid.h"
-#include "globals.h"
 #include "AccessLogEntry.h"
 #include "acl/FilledChecklist.h"
 #include "acl/Gadgets.h"
 #include "ConfigParser.h"
-#include "HttpRequest.h"
+#include "globals.h"
 #include "HttpReply.h"
+#include "HttpRequest.h"
 #include "SquidConfig.h"
 #include "Store.h"
 #include "StrList.h"

diff --git a/src/Notes.h b/src/Notes.h
index 0068bd233295ada980169fa359186f0fb99ffa5a..29bac331ee3f969a1cd9a34d36c6b77a185a1d79 100644 (file)
--- a/src/Notes.h
+++ b/src/Notes.h
@@ -2,8 +2,8 @@
 #define SQUID_NOTES_H
 
 #include "acl/forward.h"
-#include "base/Vector.h"
 #include "base/RefCount.h"
+#include "base/Vector.h"
 #include "CbDataList.h"
 #include "MemPool.h"
 #include "SquidString.h"

diff --git a/src/Packer.cc b/src/Packer.cc
index 355e2ccdc133a082085449c838c672f7703e5305..541ef04b11b43f5aef387b0396f0bd612ef1e50f 100644 (file)
--- a/src/Packer.cc
+++ b/src/Packer.cc
@@ -68,8 +68,8 @@
  */
 
 #include "squid.h"
-#include "Store.h"
 #include "MemBuf.h"
+#include "Store.h"
 
 /* local types */
 

diff --git a/src/Parsing.cc b/src/Parsing.cc
index 22ea60152a8183096979e352945c6a9daecd26d4..6f2141a3e5c2322c4b105e8e182b73123625ac7e 100644 (file)
--- a/src/Parsing.cc
+++ b/src/Parsing.cc
@@ -34,9 +34,9 @@
 #include "cache_cf.h"
 #include "compat/strtoll.h"
 #include "ConfigParser.h"
-#include "Parsing.h"
-#include "globals.h"
 #include "Debug.h"
+#include "globals.h"
+#include "Parsing.h"
 
 /*
  * These functions is the same as atoi/l/f, except that they check for errors

diff --git a/src/PeerSelectState.h b/src/PeerSelectState.h
index 2328279930b6de9373eb131437c4da4f9b9429ce..84634404a747a63f26074cc1b539c6b15118afea 100644 (file)
--- a/src/PeerSelectState.h
+++ b/src/PeerSelectState.h
@@ -38,8 +38,8 @@
 #include "cbdata.h"
 #include "comm/forward.h"
 #include "hier_code.h"
-#include "PingData.h"
 #include "ip/Address.h"
+#include "PingData.h"
 
 class HttpRequest;
 class StoreEntry;

diff --git a/src/Server.cc b/src/Server.cc
index 39ed4fe0f69b6e48f379735fdad362fb99b8d85b..1703cddbab902646a6bd07b901fea094e85bac57 100644 (file)
--- a/src/Server.cc
+++ b/src/Server.cc
@@ -36,9 +36,9 @@
 #include "comm/Connection.h"
 #include "comm/forward.h"
 #include "comm/Write.h"
-#include "fd.h"
 #include "err_detail_type.h"
 #include "errorpage.h"
+#include "fd.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "Server.h"

diff --git a/src/Server.h b/src/Server.h
index c02c54c924b18d667e7e2b82ec19f96f8556c34b..2633e8f8f317f9cecbab6e93e88f3e3b08376d95 100644 (file)
--- a/src/Server.h
+++ b/src/Server.h
@@ -32,8 +32,8 @@
 #ifndef SQUID_SERVER_H
 #define SQUID_SERVER_H
 
-#include "BodyPipe.h"
 #include "base/AsyncJob.h"
+#include "BodyPipe.h"
 #include "CommCalls.h"
 #include "FwdState.h"
 #include "StoreIOBuffer.h"

diff --git a/src/Store.cci b/src/Store.cci
index f84e97d99362422a57b29571a54743d01090ae0d..01add65b160b7934b84b93a6ce6e7b8d7d540edb 100644 (file)
--- a/src/Store.cci
+++ b/src/Store.cci
@@ -30,8 +30,8 @@
  *
  */
 
-#include "MemObject.h"
 #include "HttpReply.h"
+#include "MemObject.h"
 
 /**
  \retval true  Store contains 0 bytes of data.

diff --git a/src/StoreIOBuffer.h b/src/StoreIOBuffer.h
index 7aa5a6f9166d63de3456b7e449fed9be21da7cf6..d26bb881fe3de7d764eb42bf1f0e790c7a6974bd 100644 (file)
--- a/src/StoreIOBuffer.h
+++ b/src/StoreIOBuffer.h
@@ -34,8 +34,8 @@
 #define SQUID_STOREIOBUFFER_H
 
 /* TODO: move this and the range() method into a .cci */
-#include "Range.h"
 #include "MemBuf.h"
+#include "Range.h"
 
 class StoreIOBuffer
 {

diff --git a/src/StoreMeta.cc b/src/StoreMeta.cc
index a31caf95ea684c699c10c04c6029b6c5fc07b626..801092f2cf54f897486c438ae217327a5ed1469e 100644 (file)
--- a/src/StoreMeta.cc
+++ b/src/StoreMeta.cc
@@ -32,15 +32,15 @@
  */
 
 #include "squid.h"
-#include "StoreMeta.h"
-#include "Store.h"
 #include "MemObject.h"
+#include "Store.h"
+#include "StoreMeta.h"
 #include "StoreMetaMD5.h"
-#include "StoreMetaURL.h"
+#include "StoreMetaObjSize.h"
 #include "StoreMetaSTD.h"
 #include "StoreMetaSTDLFS.h"
+#include "StoreMetaURL.h"
 #include "StoreMetaVary.h"
-#include "StoreMetaObjSize.h"
 
 bool
 StoreMeta::validType(char type)

diff --git a/src/StoreMetaObjSize.h b/src/StoreMetaObjSize.h
index dab727f8f51fb5f179e06c9d5670d8da8acd9549..ad0e7cb446159ba7ae5e220e529fdb29d78ee022 100644 (file)
--- a/src/StoreMetaObjSize.h
+++ b/src/StoreMetaObjSize.h
@@ -30,8 +30,8 @@
 #ifndef SQUID_STOREMETAOBJSIZE_H
 #define SQUID_STOREMETAOBJSIZE_H
 
-#include "StoreMeta.h"
 #include "MemPool.h"
+#include "StoreMeta.h"
 
 class StoreMetaObjSize : public StoreMeta
 {

diff --git a/src/StoreMetaSTD.cc b/src/StoreMetaSTD.cc
index c586cf67bcbae5997e44a66b4fc4c669c133283b..b85cd1d489930090343dd7524b94e24b20e964a4 100644 (file)
--- a/src/StoreMetaSTD.cc
+++ b/src/StoreMetaSTD.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "StoreMetaSTD.h"
-#include "Store.h"
 #include "MemObject.h"
+#include "Store.h"
+#include "StoreMetaSTD.h"
 
 bool
 StoreMetaSTD::validLength(int len) const

diff --git a/src/StoreMetaSTDLFS.cc b/src/StoreMetaSTDLFS.cc
index a8bec28aa93c022b3323fc09861d86665fac1c5a..7fc6e3c5dc8229c603c15dcdf08dccbf6496e929 100644 (file)
--- a/src/StoreMetaSTDLFS.cc
+++ b/src/StoreMetaSTDLFS.cc
@@ -31,9 +31,9 @@
  */
 
 #include "squid.h"
-#include "StoreMetaSTDLFS.h"
-#include "Store.h"
 #include "MemObject.h"
+#include "Store.h"
+#include "StoreMetaSTDLFS.h"
 
 bool
 StoreMetaSTDLFS::validLength(int len) const

diff --git a/src/StoreMetaURL.cc b/src/StoreMetaURL.cc
index 9ad9d292c5c435797471f31025879e8ec826d229..e4302d1c0d79c05bb51cb93b0b0f02b248db4614 100644 (file)
--- a/src/StoreMetaURL.cc
+++ b/src/StoreMetaURL.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "StoreMetaURL.h"
-#include "Store.h"
 #include "MemObject.h"
+#include "Store.h"
+#include "StoreMetaURL.h"
 
 bool
 StoreMetaURL::checkConsistency(StoreEntry *e) const

diff --git a/src/StoreMetaUnpacker.cc b/src/StoreMetaUnpacker.cc
index 2fb97f53cd67e301aa55f58e9a06b2cae904cc6d..62a163c495de5fdff808c378640ea617c256e4d9 100644 (file)
--- a/src/StoreMetaUnpacker.cc
+++ b/src/StoreMetaUnpacker.cc
@@ -32,10 +32,10 @@
  */
 
 #include "squid.h"
-#include "defines.h"
 #include "Debug.h"
-#include "StoreMetaUnpacker.h"
+#include "defines.h"
 #include "StoreMeta.h"
+#include "StoreMetaUnpacker.h"
 
 int const StoreMetaUnpacker::MinimumBufferLength = sizeof(char) + sizeof(int);
 

diff --git a/src/StoreMetaVary.cc b/src/StoreMetaVary.cc
index 995a1a9679868c577fd8e8d652dcf6fc68edbbc5..84380db916701d2b606954ab21ed58d1d988ae5c 100644 (file)
--- a/src/StoreMetaVary.cc
+++ b/src/StoreMetaVary.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "StoreMetaVary.h"
-#include "Store.h"
 #include "MemObject.h"
+#include "Store.h"
+#include "StoreMetaVary.h"
 
 bool
 StoreMetaVary::checkConsistency(StoreEntry *e) const

diff --git a/src/StoreStats.cc b/src/StoreStats.cc
index 5c1d062c5f3491ddb8065ae87493a2674f7df795..3998db33edf796cc4d597c46e66029d85605a94a 100644 (file)
--- a/src/StoreStats.cc
+++ b/src/StoreStats.cc
@@ -4,8 +4,8 @@
  */
 
 #include "squid.h"
-#include "tools.h"
 #include "StoreStats.h"
+#include "tools.h"
 
 /* StoreInfoStats */
 

diff --git a/src/acl/AclAddress.h b/src/acl/AclAddress.h
index ead7b36e4c8e2e3f6f0e8977b9a5c2dfccd8720b..7e69f644c1d76b0308bbe8cc008723dcec3f23c4 100644 (file)
--- a/src/acl/AclAddress.h
+++ b/src/acl/AclAddress.h
@@ -29,8 +29,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
  */
 
-#include "ip/Address.h"
 #include "acl/Acl.h"
+#include "ip/Address.h"
 
 /// list of address-based ACLs. Currently a POD.
 class AclAddress

diff --git a/src/acl/AllOf.cc b/src/acl/AllOf.cc
index 3e4cc326002de7310e5982ce4b02dafb9aa3ef6e..876535602de2a876bbed26f586b645ec916cf2fc 100644 (file)
--- a/src/acl/AllOf.cc
+++ b/src/acl/AllOf.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
 #include "acl/AllOf.h"
-#include "acl/Checklist.h"
 #include "acl/BoolOps.h"
+#include "acl/Checklist.h"
 #include "globals.h"
 #include "MemBuf.h"
 

diff --git a/src/acl/Asn.h b/src/acl/Asn.h
index c49e8622296d281b61db7fef92d296f7d3c24ff4..d6932d78470ec5a47552591f7f7b437d9e12a609 100644 (file)
--- a/src/acl/Asn.h
+++ b/src/acl/Asn.h
@@ -32,10 +32,10 @@
 #ifndef SQUID_ACLASN_H
 #define SQUID_ACLASN_H
 
+#include "acl/Checklist.h"
 #include "acl/Data.h"
-#include "CbDataList.h"
 #include "acl/Strategised.h"
-#include "acl/Checklist.h"
+#include "CbDataList.h"
 #include "ip/Address.h"
 
 int asnMatchIp(CbDataList<int> *, Ip::Address &);

diff --git a/src/acl/Browser.cc b/src/acl/Browser.cc
index a09b143d0f31821c3b09f8c73173e00ee6d50d4a..36e746d254fe4e14c04fefb5674ff2805244d371 100644 (file)
--- a/src/acl/Browser.cc
+++ b/src/acl/Browser.cc
@@ -33,8 +33,8 @@
  */
 
 #include "squid.h"
-#include "acl/Checklist.h"
 #include "acl/Browser.h"
+#include "acl/Checklist.h"
 #include "acl/RegexData.h"
 
 /* explicit template instantiation required for some systems */

diff --git a/src/acl/Certificate.cc b/src/acl/Certificate.cc
index 16b0ca997d16515b14e958ffcdef148a34ff5fbf..74a27b061609d9d0bd17726f400b63a4de6cfcca 100644 (file)
--- a/src/acl/Certificate.cc
+++ b/src/acl/Certificate.cc
@@ -40,12 +40,12 @@
 #if USE_SSL
 
 #include "acl/Certificate.h"
-#include "acl/Checklist.h"
 #include "acl/CertificateData.h"
-#include "HttpRequest.h"
+#include "acl/Checklist.h"
 #include "client_side.h"
 #include "fde.h"
 #include "globals.h"
+#include "HttpRequest.h"
 
 int
 ACLCertificateStrategy::match (ACLData<MatchType> * &data, ACLFilledChecklist *checklist, ACLFlags &)

diff --git a/src/acl/Certificate.h b/src/acl/Certificate.h
index b9d0d0da16f7afd66825b09b5fd1e8625ca9b239..308eb92ff3eabf30d8d600d42abae637e6473eeb 100644 (file)
--- a/src/acl/Certificate.h
+++ b/src/acl/Certificate.h
@@ -34,10 +34,10 @@
 #define SQUID_ACLCERTIFICATE_H
 
 #include "acl/Acl.h"
-#include "acl/Data.h"
 #include "acl/Checklist.h"
-#include "ssl/support.h"
+#include "acl/Data.h"
 #include "acl/Strategised.h"
+#include "ssl/support.h"
 
 /// \ingroup ACLAPI
 class ACLCertificateStrategy : public ACLStrategy<X509 *>

diff --git a/src/acl/CertificateData.cc b/src/acl/CertificateData.cc
index 83b6ac3b1a63609a5440600d2f1478d36129aae2..d3ed5edf726981acb400ae716a6d8ef38bc409bb 100644 (file)
--- a/src/acl/CertificateData.cc
+++ b/src/acl/CertificateData.cc
@@ -35,8 +35,8 @@
 #include "squid.h"
 #include "acl/CertificateData.h"
 #include "acl/Checklist.h"
-#include "Debug.h"
 #include "cache_cf.h"
+#include "Debug.h"
 #include "wordlist.h"
 
 ACLCertificateData::ACLCertificateData(Ssl::GETX509ATTRIBUTE *sslStrategy, const char *attrs, bool optionalAttr) : validAttributesStr(attrs), attributeIsOptional(optionalAttr), attribute (NULL), values (), sslAttributeCall (sslStrategy)

diff --git a/src/acl/CertificateData.h b/src/acl/CertificateData.h
index 911f549bd67e486dff3ea7f8495067c65fe5ac8c..9ca261eb7d49177c3797ab389b02e5fbebe80110 100644 (file)
--- a/src/acl/CertificateData.h
+++ b/src/acl/CertificateData.h
@@ -33,11 +33,11 @@
 #ifndef SQUID_ACLCERTIFICATEDATA_H
 #define SQUID_ACLCERTIFICATEDATA_H
 
-#include "splay.h"
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "ssl/support.h"
 #include "acl/StringData.h"
+#include "splay.h"
+#include "ssl/support.h"
 #include <string>
 #include <list>
 

diff --git a/src/acl/DestinationDomain.cc b/src/acl/DestinationDomain.cc
index 88244faec7ec7fdd1af0303834e76e3c883b8153..a5e1abd80b43cb16cf18e2a1e7680c9505322bf0 100644 (file)
--- a/src/acl/DestinationDomain.cc
+++ b/src/acl/DestinationDomain.cc
@@ -33,10 +33,10 @@
  */
 
 #include "squid.h"
-#include "acl/DestinationDomain.h"
 #include "acl/Checklist.h"
-#include "acl/RegexData.h"
+#include "acl/DestinationDomain.h"
 #include "acl/DomainData.h"
+#include "acl/RegexData.h"
 #include "fqdncache.h"
 #include "HttpRequest.h"
 #include "ipcache.h"

diff --git a/src/acl/DestinationDomain.h b/src/acl/DestinationDomain.h
index d772521fd6e58adffe04c400730eebf476127b91..7d2e4968aa0656680a239b097823242694b8ec96 100644 (file)
--- a/src/acl/DestinationDomain.h
+++ b/src/acl/DestinationDomain.h
@@ -34,8 +34,8 @@
 #define SQUID_ACLDESTINATIONDOMAIN_H
 
 #include "acl/Acl.h"
-#include "acl/Data.h"
 #include "acl/Checklist.h"
+#include "acl/Data.h"
 #include "acl/Strategised.h"
 
 /// \ingroup ACLAPI

diff --git a/src/acl/DomainData.cc b/src/acl/DomainData.cc
index 98716b89fd7b72124b5f591d4897cc5dc3004fda..b2f6e8be5a870a0dd8e117ec0174306b450f5290 100644 (file)
--- a/src/acl/DomainData.cc
+++ b/src/acl/DomainData.cc
@@ -33,12 +33,12 @@
  */
 
 #include "squid.h"
-#include "acl/DomainData.h"
 #include "acl/Checklist.h"
+#include "acl/DomainData.h"
 #include "cache_cf.h"
 #include "Debug.h"
-#include "wordlist.h"
 #include "src/URL.h"
+#include "wordlist.h"
 
 template<class T>
 inline void

diff --git a/src/acl/DomainData.h b/src/acl/DomainData.h
index 7e7e3b41be843dfa5ed33e0ee7138d8e2690f881..7839a8f75d9a6350685d54da8afa93bdfe896f1f 100644 (file)
--- a/src/acl/DomainData.h
+++ b/src/acl/DomainData.h
@@ -33,9 +33,9 @@
 #ifndef SQUID_ACLDOMAINDATA_H
 #define SQUID_ACLDOMAINDATA_H
 
-#include "splay.h"
 #include "acl/Acl.h"
 #include "acl/Data.h"
+#include "splay.h"
 
 /// \ingroup ACLAPI
 class ACLDomainData : public ACLData<char const *>

diff --git a/src/acl/FilledChecklist.cc b/src/acl/FilledChecklist.cc
index 9e8fa17ea41c7fe303e4990a589a2ba8abf27d1f..c02f799a4a1dde7f0d4fffb40d23fe256f49d2a5 100644 (file)
--- a/src/acl/FilledChecklist.cc
+++ b/src/acl/FilledChecklist.cc
@@ -7,8 +7,8 @@
 #include "HttpRequest.h"
 #include "SquidConfig.h"
 #if USE_AUTH
-#include "auth/UserRequest.h"
 #include "auth/AclProxyAuth.h"
+#include "auth/UserRequest.h"
 #endif
 
 CBDATA_CLASS_INIT(ACLFilledChecklist);

diff --git a/src/acl/Gadgets.cc b/src/acl/Gadgets.cc
index 8d3c0a5681fea68cb9f3737a7487c85ae085ca04..62c1d18bef54bae4f3ef464f4b1513b2f63a048d 100644 (file)
--- a/src/acl/Gadgets.cc
+++ b/src/acl/Gadgets.cc
@@ -38,12 +38,12 @@
 
 #include "squid.h"
 #include "acl/Acl.h"
-#include "acl/AclNameList.h"
 #include "acl/AclDenyInfoList.h"
+#include "acl/AclNameList.h"
 #include "acl/Checklist.h"
-#include "acl/Tree.h"
-#include "acl/Strategised.h"
 #include "acl/Gadgets.h"
+#include "acl/Strategised.h"
+#include "acl/Tree.h"
 #include "ConfigParser.h"
 #include "errorpage.h"
 #include "globals.h"

diff --git a/src/acl/Gadgets.h b/src/acl/Gadgets.h
index a5a36f000050daee5e592061d1265bfc383ae616..be68d3335f7acf69a6d7feb82eb69f5defaa29d9 100644 (file)
--- a/src/acl/Gadgets.h
+++ b/src/acl/Gadgets.h
@@ -1,8 +1,8 @@
 #ifndef SQUID_ACL_GADGETS_H
 #define SQUID_ACL_GADGETS_H
 
-#include "err_type.h"
 #include "acl/forward.h"
+#include "err_type.h"
 
 #if HAVE_SSTREAM
 #include <sstream>

diff --git a/src/acl/HierCode.cc b/src/acl/HierCode.cc
index c691e78e51d3ac54df44fe26c2ab359623a504ac..0ed141f9c089d15654867841a4d76bbef2bc8c8a 100644 (file)
--- a/src/acl/HierCode.cc
+++ b/src/acl/HierCode.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
+#include "acl/Checklist.h"
 #include "acl/HierCode.h"
 #include "acl/HierCodeData.h"
-#include "acl/Checklist.h"
 #include "HttpRequest.h"
 
 /* explicit template instantiation required for some systems */

diff --git a/src/acl/HierCode.h b/src/acl/HierCode.h
index ac9aac8d2a222a6e216fd88a882f8afe2951afdc..7b35eedddbb9201cff63f0aea8dbdc3cdfb7787b 100644 (file)
--- a/src/acl/HierCode.h
+++ b/src/acl/HierCode.h
@@ -1,8 +1,8 @@
 #ifndef SQUID_ACLHIERCODE_H
 #define SQUID_ACLHIERCODE_H
 
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 #include "hier_code.h"
 
 /// \ingroup ACLAPI

diff --git a/src/acl/HierCodeData.cc b/src/acl/HierCodeData.cc
index 8f6ec2c0dc87ff8c08cedc6af4498feed52fa69b..a5c224fc6996d91c79d0bad3c8d215eda1461443 100644 (file)
--- a/src/acl/HierCodeData.cc
+++ b/src/acl/HierCodeData.cc
@@ -1,6 +1,6 @@
 #include "squid.h"
-#include "acl/HierCodeData.h"
 #include "acl/Checklist.h"
+#include "acl/HierCodeData.h"
 #include "cache_cf.h"
 #include "hier_code.h"
 #include "wordlist.h"

diff --git a/src/acl/HttpHeaderData.cc b/src/acl/HttpHeaderData.cc
index d84633df05a7b21e2a5133e081128a359ef4f89a..56e1632aff8a5e766dd043ed6e3f7f42b1089f6c 100644 (file)
--- a/src/acl/HttpHeaderData.cc
+++ b/src/acl/HttpHeaderData.cc
@@ -33,15 +33,15 @@
  */
 
 #include "squid.h"
-#include "acl/HttpHeaderData.h"
-#include "acl/Checklist.h"
 #include "acl/Acl.h"
+#include "acl/Checklist.h"
+#include "acl/HttpHeaderData.h"
 #include "acl/RegexData.h"
 #include "cache_cf.h"
-#include "Debug.h"
-#include "wordlist.h"
 #include "ConfigParser.h"
+#include "Debug.h"
 #include "HttpHeaderTools.h"
+#include "wordlist.h"
 
 /* Construct an ACLHTTPHeaderData that uses an ACLRegex rule with the value of the
  * selected header from a given request.

diff --git a/src/acl/HttpRepHeader.cc b/src/acl/HttpRepHeader.cc
index d14daa29085c409c76b2c599b0c4404a532a0a30..a040e2407d9fe1da562e5aa25ab5cdedf72dd208 100644 (file)
--- a/src/acl/HttpRepHeader.cc
+++ b/src/acl/HttpRepHeader.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "acl/HttpRepHeader.h"
-#include "acl/HttpHeaderData.h"
 #include "acl/Checklist.h"
+#include "acl/HttpHeaderData.h"
+#include "acl/HttpRepHeader.h"
 #include "HttpReply.h"
 
 int

diff --git a/src/acl/HttpRepHeader.h b/src/acl/HttpRepHeader.h
index 1f019058a5f0677b4877855994729a91574a0de2..9f605631c6923d43b4ce9dcc5da0a630038c449e 100644 (file)
--- a/src/acl/HttpRepHeader.h
+++ b/src/acl/HttpRepHeader.h
@@ -33,8 +33,8 @@
 #ifndef SQUID_ACLHTTPREPHEADER_H
 #define SQUID_ACLHTTPREPHEADER_H
 
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 #include "HttpHeader.h"
 
 /// \ingroup ACLAPI

diff --git a/src/acl/HttpReqHeader.cc b/src/acl/HttpReqHeader.cc
index 49c701b04da6844b720b2ed0aa91a46320b59bdf..5c6acd2ab5cf1b32cc015b4db494b84fccbf82ac 100644 (file)
--- a/src/acl/HttpReqHeader.cc
+++ b/src/acl/HttpReqHeader.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "acl/HttpReqHeader.h"
-#include "acl/HttpHeaderData.h"
 #include "acl/Checklist.h"
+#include "acl/HttpHeaderData.h"
+#include "acl/HttpReqHeader.h"
 #include "HttpRequest.h"
 
 int

diff --git a/src/acl/HttpReqHeader.h b/src/acl/HttpReqHeader.h
index e805207ebe149f79c550cd9f664ce86eadc7a870..1f342eabca930995f0eb72cfd3ab62eb6ca07c6e 100644 (file)
--- a/src/acl/HttpReqHeader.h
+++ b/src/acl/HttpReqHeader.h
@@ -33,8 +33,8 @@
 #ifndef SQUID_ACLHTTPREQHEADER_H
 #define SQUID_ACLHTTPREQHEADER_H
 
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 #include "HttpHeader.h"
 
 /// \ingroup ACLAPI

diff --git a/src/acl/HttpStatus.cc b/src/acl/HttpStatus.cc
index a20120cfa926168f37ad35b81973ea5c50316381..f4e423ac43b20f2d2d2eb323666946764473c36b 100644 (file)
--- a/src/acl/HttpStatus.cc
+++ b/src/acl/HttpStatus.cc
@@ -33,8 +33,8 @@
  */
 
 #include "squid.h"
-#include "acl/HttpStatus.h"
 #include "acl/FilledChecklist.h"
+#include "acl/HttpStatus.h"
 #include "cache_cf.h"
 #include "Debug.h"
 #include "HttpReply.h"

diff --git a/src/acl/IntRange.cc b/src/acl/IntRange.cc
index f0dc78fc783c30f1476ba88fe5e700397522eba0..40eeb67f14d58f6444f05e5b91f4cbe7d3103ae3 100644 (file)
--- a/src/acl/IntRange.cc
+++ b/src/acl/IntRange.cc
@@ -36,8 +36,8 @@
 #include "acl/IntRange.h"
 #include "cache_cf.h"
 #include "Debug.h"
-#include "wordlist.h"
 #include "Parsing.h"
+#include "wordlist.h"
 
 /* explicit instantiation required for some systems */
 /** \cond AUTODOCS-IGNORE */

diff --git a/src/acl/Ip.cc b/src/acl/Ip.cc
index 47dc027d46c153d33b6de8fcf32761436630ab94..81ff1becdb2c2efefdace765f2b1b908310267d1 100644 (file)
--- a/src/acl/Ip.cc
+++ b/src/acl/Ip.cc
@@ -32,8 +32,8 @@
  */
 
 #include "squid.h"
-#include "acl/Ip.h"
 #include "acl/Checklist.h"
+#include "acl/Ip.h"
 #include "cache_cf.h"
 #include "Debug.h"
 #include "ip/tools.h"

diff --git a/src/acl/Ip.h b/src/acl/Ip.h
index 49f8f0031815868b48f0988d472f728611838063..662d41424b048a038b3d1dc76c482562d4a8c9b3 100644 (file)
--- a/src/acl/Ip.h
+++ b/src/acl/Ip.h
@@ -34,8 +34,8 @@
 
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "splay.h"
 #include "ip/Address.h"
+#include "splay.h"
 
 /// \ingroup ACLAPI
 class acl_ip_data

diff --git a/src/acl/LocalIp.cc b/src/acl/LocalIp.cc
index a32f09f8fb815829ea712df0854a400bfc5a3524..e4c08198fc21308f90b1acdf269c6e34154aa06b 100644 (file)
--- a/src/acl/LocalIp.cc
+++ b/src/acl/LocalIp.cc
@@ -32,8 +32,8 @@
  */
 
 #include "squid.h"
-#include "acl/LocalIp.h"
 #include "acl/FilledChecklist.h"
+#include "acl/LocalIp.h"
 
 char const *
 ACLLocalIP::typeString() const

diff --git a/src/acl/LocalPort.cc b/src/acl/LocalPort.cc
index 34b9703f271ce9e8a76ed9e77e9f818924e593b4..77e267894c405d8cce4749957660f4f4677111d3 100644 (file)
--- a/src/acl/LocalPort.cc
+++ b/src/acl/LocalPort.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "acl/LocalPort.h"
-#include "acl/IntRange.h"
 #include "acl/Checklist.h"
+#include "acl/IntRange.h"
+#include "acl/LocalPort.h"
 
 int
 ACLLocalPortStrategy::match (ACLData<MatchType> * &data, ACLFilledChecklist *checklist, ACLFlags &)

diff --git a/src/acl/LocalPort.h b/src/acl/LocalPort.h
index dd57aa03eaec554a1ca197266ae5e60395cf70ce..2dec7f675530cfed5946603dffeba0a875863b5a 100644 (file)
--- a/src/acl/LocalPort.h
+++ b/src/acl/LocalPort.h
@@ -33,8 +33,8 @@
 #ifndef SQUID_ACLLOCALPORT_H
 #define SQUID_ACLLOCALPORT_H
 
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 
 /// \ingroup ACLAPI
 class ACLLocalPortStrategy : public ACLStrategy<int>

diff --git a/src/acl/Method.cc b/src/acl/Method.cc
index 08fd2eeb58dcf994e2a4b35cfbc8df7a1bdae813..fd43d97e0c531e6e27e0b07895f3f61a6fa94331 100644 (file)
--- a/src/acl/Method.cc
+++ b/src/acl/Method.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
+#include "acl/Checklist.h"
 #include "acl/Method.h"
 #include "acl/MethodData.h"
-#include "acl/Checklist.h"
 #include "HttpRequest.h"
 
 /* explicit template instantiation required for some systems */

diff --git a/src/acl/Method.h b/src/acl/Method.h
index 96ade28de3f782390a5f0957593c074a30e1cb3e..636793d4ad5a17ce94d48bf7ee08b29904e3acff 100644 (file)
--- a/src/acl/Method.h
+++ b/src/acl/Method.h
@@ -33,8 +33,8 @@
 #ifndef SQUID_ACLMETHOD_H
 #define SQUID_ACLMETHOD_H
 
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 #include "HttpRequestMethod.h"
 
 /// \ingroup ACLAPI

diff --git a/src/acl/MethodData.cc b/src/acl/MethodData.cc
index 0cc5241555f6038370095c6133cfdb19af126547..b9a8fefd8a7f24ee2acfc5f07969cf4fa40935db 100644 (file)
--- a/src/acl/MethodData.cc
+++ b/src/acl/MethodData.cc
@@ -33,8 +33,8 @@
  */
 
 #include "squid.h"
-#include "acl/MethodData.h"
 #include "acl/Checklist.h"
+#include "acl/MethodData.h"
 #include "cache_cf.h"
 #include "HttpRequestMethod.h"
 #include "wordlist.h"

diff --git a/src/acl/MyPortName.h b/src/acl/MyPortName.h
index 9890d5a38120618729728edcf4f5c9670f92dedc..b5aa37ca5c200b5623b5ae8441d691d6beafb37d 100644 (file)
--- a/src/acl/MyPortName.h
+++ b/src/acl/MyPortName.h
@@ -33,8 +33,8 @@
 
 #ifndef SQUID_ACLMYPORTNAME_H
 #define SQUID_ACLMYPORTNAME_H
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 
 class ACLMyPortNameStrategy : public ACLStrategy<const char *>
 {

diff --git a/src/acl/Note.cc b/src/acl/Note.cc
index a5d8a85a2569d44ebdeb8699efda58b8ee1b0c37..24e4e116f2a4268d8627a285760d3b76335f5d03 100644 (file)
--- a/src/acl/Note.cc
+++ b/src/acl/Note.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
-#include "acl/Note.h"
-#include "acl/HttpHeaderData.h"
 #include "acl/Checklist.h"
+#include "acl/HttpHeaderData.h"
+#include "acl/Note.h"
 #include "HttpRequest.h"
 #include "Notes.h"
 

diff --git a/src/acl/Note.h b/src/acl/Note.h
index 972cd654292f9475a8c8676a11ed63102387a62d..798bb2375611b8cc2328aaf34e34fedade0cb101 100644 (file)
--- a/src/acl/Note.h
+++ b/src/acl/Note.h
@@ -1,8 +1,8 @@
 #ifndef SQUID_ACLNOTE_H
 #define SQUID_ACLNOTE_H
 
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 
 class HttpRequest;
 

diff --git a/src/acl/NoteData.h b/src/acl/NoteData.h
index b62031072e63c24ba5d96f4561b50af74be08d1c..c6ef8f37fd7ac8760b77f8a6eceb28af4dcad4ef 100644 (file)
--- a/src/acl/NoteData.h
+++ b/src/acl/NoteData.h
@@ -2,8 +2,8 @@
 #define SQUID_ACLNOTEDATA_H
 
 #include "acl/Data.h"
-#include "SquidString.h"
 #include "MemPool.h"
+#include "SquidString.h"
 
 class HttpRequest;
 class NotePairs;

diff --git a/src/acl/PeerName.cc b/src/acl/PeerName.cc
index a3c36eb2d03f147cc88b6fefceb440a8bdbb3210..3b69a04300997699f94a227b10bb0b19de173eab 100644 (file)
--- a/src/acl/PeerName.cc
+++ b/src/acl/PeerName.cc
@@ -1,8 +1,8 @@
 #include "squid.h"
+#include "acl/Checklist.h"
 #include "acl/PeerName.h"
 #include "acl/RegexData.h"
 #include "acl/StringData.h"
-#include "acl/Checklist.h"
 #include "CachePeer.h"
 
 int

diff --git a/src/acl/PeerName.h b/src/acl/PeerName.h
index 84c23ee6fa836e095b7e1ff42a692ac0bdd7db9c..20c80c9755c5df75b3ff67c13ca77b97a156ddf6 100644 (file)
--- a/src/acl/PeerName.h
+++ b/src/acl/PeerName.h
@@ -1,8 +1,8 @@
 #ifndef SQUID_ACLPEERNAME_H
 #define SQUID_ACLPEERNAME_H
 
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 
 class ACLPeerNameStrategy : public ACLStrategy<const char *>
 {

diff --git a/src/acl/Protocol.cc b/src/acl/Protocol.cc
index 067977b9f8132727638c46e971994e880efa4b06..1fb1bc38fb9b5300a1e575e3b294fa087cb5fc4a 100644 (file)
--- a/src/acl/Protocol.cc
+++ b/src/acl/Protocol.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
+#include "acl/Checklist.h"
 #include "acl/Protocol.h"
 #include "acl/ProtocolData.h"
-#include "acl/Checklist.h"
 #include "HttpRequest.h"
 
 /* explicit template instantiation required for some systems */

diff --git a/src/acl/Protocol.h b/src/acl/Protocol.h
index d2aea168b4bad2c2b0996feaa254e16897d90595..7693558222d9713a132320b2bd76db46d9c73fca 100644 (file)
--- a/src/acl/Protocol.h
+++ b/src/acl/Protocol.h
@@ -34,8 +34,8 @@
 #ifndef SQUID_ACLPROTOCOL_H
 #define SQUID_ACLPROTOCOL_H
 
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 #include "anyp/ProtocolType.h"
 
 class ACLProtocolStrategy : public ACLStrategy<AnyP::ProtocolType>

diff --git a/src/acl/ProtocolData.cc b/src/acl/ProtocolData.cc
index 9b61dc50d199c4d9140dcebb648da13a415ff9bf..dc2a453a2b16b36836b038acb40977f3fe12d2e8 100644 (file)
--- a/src/acl/ProtocolData.cc
+++ b/src/acl/ProtocolData.cc
@@ -33,8 +33,8 @@
  */
 
 #include "squid.h"
-#include "acl/ProtocolData.h"
 #include "acl/Checklist.h"
+#include "acl/ProtocolData.h"
 #include "cache_cf.h"
 #include "Debug.h"
 #include "URLScheme.h"

diff --git a/src/acl/Referer.cc b/src/acl/Referer.cc
index c8eb4b638f0c1aa57860ce327e782393186376aa..406455edd7c25400a9e934c1ba97e3271e82627c 100644 (file)
--- a/src/acl/Referer.cc
+++ b/src/acl/Referer.cc
@@ -33,8 +33,8 @@
  */
 
 #include "squid.h"
-#include "acl/Referer.h"
 #include "acl/Checklist.h"
+#include "acl/Referer.h"
 #include "acl/RegexData.h"
 
 /* explicit template instantiation required for some systems */

diff --git a/src/acl/RegexData.cc b/src/acl/RegexData.cc
index 469ff0dbda281e70079790124db1a75ec955708a..63ebe2db14dc258e928b29273c89fe94ed49a215 100644 (file)
--- a/src/acl/RegexData.cc
+++ b/src/acl/RegexData.cc
@@ -35,9 +35,9 @@
  */
 
 #include "squid.h"
-#include "acl/RegexData.h"
-#include "acl/Checklist.h"
 #include "acl/Acl.h"
+#include "acl/Checklist.h"
+#include "acl/RegexData.h"
 #include "ConfigParser.h"
 #include "Debug.h"
 #include "Mem.h"

diff --git a/src/acl/ReplyHeaderStrategy.h b/src/acl/ReplyHeaderStrategy.h
index 857b7d9d3fe1d88dd144061cc0a4aea44fefddd2..a8ef8c83d847939998b897be6c0d9d12dc7ad776 100644 (file)
--- a/src/acl/ReplyHeaderStrategy.h
+++ b/src/acl/ReplyHeaderStrategy.h
@@ -36,8 +36,8 @@ class ACLChecklist;
 
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "acl/Strategy.h"
 #include "acl/FilledChecklist.h"
+#include "acl/Strategy.h"
 #include "HttpReply.h"
 
 template <http_hdr_type header>

diff --git a/src/acl/ReplyMimeType.cc b/src/acl/ReplyMimeType.cc
index 9be4a9788932371fc0478820030e269ebae6434b..5ca6f6512b7f330869c52a6acdb636f607811860 100644 (file)
--- a/src/acl/ReplyMimeType.cc
+++ b/src/acl/ReplyMimeType.cc
@@ -33,9 +33,9 @@
  */
 
 #include "squid.h"
-#include "acl/ReplyMimeType.h"
 #include "acl/Checklist.h"
 #include "acl/RegexData.h"
+#include "acl/ReplyMimeType.h"
 
 /* explicit template instantiation required for some systems */
 

diff --git a/src/acl/ReplyMimeType.h b/src/acl/ReplyMimeType.h
index cec43f710693a13a3e5defe4469e1e3398334f8b..9e619b71587481b6ea942304324a64a51b3a55e7 100644 (file)
--- a/src/acl/ReplyMimeType.h
+++ b/src/acl/ReplyMimeType.h
@@ -45,9 +45,9 @@ private:
 
 /* partial specialisation */
 
+#include "acl/Checklist.h"
 #include "acl/Data.h"
 #include "acl/ReplyHeaderStrategy.h"
-#include "acl/Checklist.h"
 
 template <>
 inline int

diff --git a/src/acl/RequestHeaderStrategy.h b/src/acl/RequestHeaderStrategy.h
index 7d2c71890972deb205ec0ed4349f7330dd5ac0db..c2be587ebfaf1824c04ce541d6412a4a31616edf 100644 (file)
--- a/src/acl/RequestHeaderStrategy.h
+++ b/src/acl/RequestHeaderStrategy.h
@@ -35,9 +35,9 @@
 #define SQUID_ACLREQUESTHEADERSTRATEGY_H
 #include "acl/Acl.h"
 #include "acl/Data.h"
+#include "acl/FilledChecklist.h"
 #include "acl/Strategy.h"
 #include "HttpRequest.h"
-#include "acl/FilledChecklist.h"
 
 template <http_hdr_type header>
 

diff --git a/src/acl/RequestMimeType.cc b/src/acl/RequestMimeType.cc
index b96da428c1300d64a46105f5c8295001f158f32d..429744623141d8f4e1a758a3a6ece47a74d631b9 100644 (file)
--- a/src/acl/RequestMimeType.cc
+++ b/src/acl/RequestMimeType.cc
@@ -33,9 +33,9 @@
  */
 
 #include "squid.h"
-#include "acl/RequestMimeType.h"
 #include "acl/Checklist.h"
 #include "acl/RegexData.h"
+#include "acl/RequestMimeType.h"
 
 /* explicit template instantiation required for some systems */
 

diff --git a/src/acl/RequestMimeType.h b/src/acl/RequestMimeType.h
index 2859370839498e5b412e567077c87600671be1c2..292ef4d7695ff8e1990c7036d40dc5aa04d232f0 100644 (file)
--- a/src/acl/RequestMimeType.h
+++ b/src/acl/RequestMimeType.h
@@ -45,9 +45,9 @@ private:
 
 /* partial specialisation */
 
+#include "acl/Checklist.h"
 #include "acl/Data.h"
 #include "acl/RequestHeaderStrategy.h"
-#include "acl/Checklist.h"
 
 template <>
 inline int

diff --git a/src/acl/ServerCertificate.cc b/src/acl/ServerCertificate.cc
index f87189a6389249c3678f2fcc2911b0a5f2e517cc..5d5e73ec2919cd67986fc69ae340aa19206e08f2 100644 (file)
--- a/src/acl/ServerCertificate.cc
+++ b/src/acl/ServerCertificate.cc
@@ -5,9 +5,9 @@
 
 #if USE_SSL
 
-#include "acl/ServerCertificate.h"
-#include "acl/Checklist.h"
 #include "acl/CertificateData.h"
+#include "acl/Checklist.h"
+#include "acl/ServerCertificate.h"
 #include "client_side.h"
 #include "fde.h"
 #include "ssl/ServerBump.h"

diff --git a/src/acl/ServerCertificate.h b/src/acl/ServerCertificate.h
index e32cda36691a54e14138051f5c001607d3ff3ced..26e66091ee67f4cae40ce7ec29e855d3f6ab0d63 100644 (file)
--- a/src/acl/ServerCertificate.h
+++ b/src/acl/ServerCertificate.h
@@ -5,10 +5,10 @@
 #define SQUID_ACLSERVERCERTIFICATE_H
 
 #include "acl/Acl.h"
-#include "acl/Data.h"
 #include "acl/Checklist.h"
-#include "ssl/support.h"
+#include "acl/Data.h"
 #include "acl/Strategised.h"
+#include "ssl/support.h"
 
 /// \ingroup ACLAPI
 class ACLServerCertificateStrategy : public ACLStrategy<X509 *>

diff --git a/src/acl/SourceDomain.cc b/src/acl/SourceDomain.cc
index a68ed988d82114abb2dbbd18c05f23edebd2a1e6..be97c3551a3c5775b5524dc6e994fb0630ea0ac4 100644 (file)
--- a/src/acl/SourceDomain.cc
+++ b/src/acl/SourceDomain.cc
@@ -33,10 +33,10 @@
  */
 
 #include "squid.h"
-#include "acl/SourceDomain.h"
 #include "acl/Checklist.h"
-#include "acl/RegexData.h"
 #include "acl/DomainData.h"
+#include "acl/RegexData.h"
+#include "acl/SourceDomain.h"
 #include "fqdncache.h"
 #include "HttpRequest.h"
 

diff --git a/src/acl/SourceDomain.h b/src/acl/SourceDomain.h
index 8e82857419787f4165e4c0bcd596aa1fbb3bee1a..2be3caba21efacac12bac7b8adac6d4d0bffb291 100644 (file)
--- a/src/acl/SourceDomain.h
+++ b/src/acl/SourceDomain.h
@@ -34,8 +34,8 @@
 #ifndef SQUID_ACLSOURCEDOMAIN_H
 #define SQUID_ACLSOURCEDOMAIN_H
 #include "acl/Acl.h"
-#include "acl/Data.h"
 #include "acl/Checklist.h"
+#include "acl/Data.h"
 #include "acl/Strategised.h"
 
 class ACLSourceDomainStrategy : public ACLStrategy<char const *>

diff --git a/src/acl/SourceIp.cc b/src/acl/SourceIp.cc
index c2726fff7641422eee293b85916f2382fb5e5a7d..d0a54530239f1712f0c7d4481b7cfa409536f9c2 100644 (file)
--- a/src/acl/SourceIp.cc
+++ b/src/acl/SourceIp.cc
@@ -32,8 +32,8 @@
  */
 
 #include "squid.h"
-#include "acl/SourceIp.h"
 #include "acl/FilledChecklist.h"
+#include "acl/SourceIp.h"
 
 char const *
 ACLSourceIP::typeString() const

diff --git a/src/acl/SslError.cc b/src/acl/SslError.cc
index 6eae03e67b599d0ac22049c9bc8b014d71912c35..8a2336b0b207eb9063c375b29771a61ebba31669 100644 (file)
--- a/src/acl/SslError.cc
+++ b/src/acl/SslError.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
+#include "acl/Checklist.h"
 #include "acl/SslError.h"
 #include "acl/SslErrorData.h"
-#include "acl/Checklist.h"
 
 int
 ACLSslErrorStrategy::match (ACLData<MatchType> * &data, ACLFilledChecklist *checklist, ACLFlags &)

diff --git a/src/acl/SslError.h b/src/acl/SslError.h
index ea71844062e251b11579e037b963ef1f337e6b9e..a14ba05f334743e77509f58796fcb9be6086d499 100644 (file)
--- a/src/acl/SslError.h
+++ b/src/acl/SslError.h
@@ -1,7 +1,7 @@
 #ifndef SQUID_ACLSSL_ERROR_H
 #define SQUID_ACLSSL_ERROR_H
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 #include "ssl/support.h"
 
 class ACLSslErrorStrategy : public ACLStrategy<const Ssl::CertErrors *>

diff --git a/src/acl/SslErrorData.cc b/src/acl/SslErrorData.cc
index 2de5e2394f179062d9c632d6ecb7a8ca24192bf4..4ac522228deab0c32c0db2ddd100814e95ad9d4a 100644 (file)
--- a/src/acl/SslErrorData.cc
+++ b/src/acl/SslErrorData.cc
@@ -32,8 +32,8 @@
  */
 
 #include "squid.h"
-#include "acl/SslErrorData.h"
 #include "acl/Checklist.h"
+#include "acl/SslErrorData.h"
 #include "cache_cf.h"
 #include "wordlist.h"
 

diff --git a/src/acl/SslErrorData.h b/src/acl/SslErrorData.h
index 70f1c14223d9260c17309ac18e4cc79c1fd769a4..5104b308edbbaf100ddb8104a9f3f6b5cf15a6af 100644 (file)
--- a/src/acl/SslErrorData.h
+++ b/src/acl/SslErrorData.h
@@ -3,8 +3,8 @@
 #include "acl/Acl.h"
 #include "acl/Data.h"
 #include "CbDataList.h"
-#include "ssl/support.h"
 #include "ssl/ErrorDetail.h"
+#include "ssl/support.h"
 #include <vector>
 
 class ACLSslErrorData : public ACLData<const Ssl::CertErrors *>

diff --git a/src/acl/Strategised.h b/src/acl/Strategised.h
index 971cc62a5c9df3c33a18c770b4669b40a568ce39..6a2e276c0929697d4c367d813b9da097168a2648 100644 (file)
--- a/src/acl/Strategised.h
+++ b/src/acl/Strategised.h
@@ -35,8 +35,8 @@
 #define SQUID_ACLSTRATEGISED_H
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "acl/Strategy.h"
 #include "acl/FilledChecklist.h"
+#include "acl/Strategy.h"
 
 template <class M>
 

diff --git a/src/acl/StringData.cc b/src/acl/StringData.cc
index 2067b910433e2c1f3567012e64601612ccf55ba4..c67fd456d29ae5e47a2fe8b27d815002092b361a 100644 (file)
--- a/src/acl/StringData.cc
+++ b/src/acl/StringData.cc
@@ -33,8 +33,8 @@
  */
 
 #include "squid.h"
-#include "acl/StringData.h"
 #include "acl/Checklist.h"
+#include "acl/StringData.h"
 #include "cache_cf.h"
 #include "Debug.h"
 #include "wordlist.h"

diff --git a/src/acl/StringData.h b/src/acl/StringData.h
index b036ffa385327a5287e301a0ecd48902ba51d8da..4a8bab582cad940a12306a269fec528c023c3a3e 100644 (file)
--- a/src/acl/StringData.h
+++ b/src/acl/StringData.h
@@ -33,9 +33,9 @@
 
 #ifndef SQUID_ACLSTRINGDATA_H
 #define SQUID_ACLSTRINGDATA_H
-#include "splay.h"
 #include "acl/Acl.h"
 #include "acl/Data.h"
+#include "splay.h"
 
 class ACLStringData : public ACLData<char const *>
 {

diff --git a/src/acl/Tag.cc b/src/acl/Tag.cc
index 17ffdcdd2832328517bf47979f7a6b838ce6a697..64e4de45a2b48f7239f4fb84e251545d9f68b2fa 100644 (file)
--- a/src/acl/Tag.cc
+++ b/src/acl/Tag.cc
@@ -35,9 +35,9 @@
  */
 
 #include "squid.h"
-#include "acl/Tag.h"
-#include "acl/StringData.h"
 #include "acl/Checklist.h"
+#include "acl/StringData.h"
+#include "acl/Tag.h"
 #include "HttpRequest.h"
 
 int

diff --git a/src/acl/Tag.h b/src/acl/Tag.h
index bdd243183083b61492160b28c3e0a2a179cfc363..33fec55328356df43a76eb6d8027a7800b7bd6d9 100644 (file)
--- a/src/acl/Tag.h
+++ b/src/acl/Tag.h
@@ -34,8 +34,8 @@
 #ifndef SQUID_ACLTAG_H
 #define SQUID_ACLTAG_H
 
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 
 class ACLTagStrategy : public ACLStrategy<const char *>
 {

diff --git a/src/acl/TimeData.cc b/src/acl/TimeData.cc
index efa5ea0bcc544afbfa18b86f533a81d56a661050..6f8a3da20a7e1d8bb1eee6cf48919344ac9b5008 100644 (file)
--- a/src/acl/TimeData.cc
+++ b/src/acl/TimeData.cc
@@ -33,8 +33,8 @@
  */
 
 #include "squid.h"
-#include "acl/TimeData.h"
 #include "acl/Checklist.h"
+#include "acl/TimeData.h"
 #include "cache_cf.h"
 #include "Debug.h"
 #include "wordlist.h"

diff --git a/src/acl/TimeData.h b/src/acl/TimeData.h
index f929c0a077ff928245b8bb48195890f1bd456d48..dca42ac47e015ca0a92aa13e16b8d8ed97feeda6 100644 (file)
--- a/src/acl/TimeData.h
+++ b/src/acl/TimeData.h
@@ -33,9 +33,9 @@
 
 #ifndef SQUID_ACLTIMEDATA_H
 #define SQUID_ACLTIMEDATA_H
-#include "splay.h"
 #include "acl/Acl.h"
 #include "acl/Data.h"
+#include "splay.h"
 
 class ACLTimeData : public ACLData<time_t>
 {

diff --git a/src/acl/Url.cc b/src/acl/Url.cc
index ca47794c103162d58de4d1271261e38cda39b8ba..bdb693aee3a5b193f13b191e5e08e7e70c0e6a82 100644 (file)
--- a/src/acl/Url.cc
+++ b/src/acl/Url.cc
@@ -33,9 +33,9 @@
  */
 
 #include "squid.h"
-#include "acl/Url.h"
 #include "acl/Checklist.h"
 #include "acl/RegexData.h"
+#include "acl/Url.h"
 #include "rfc1738.h"
 #include "src/URL.h"
 

diff --git a/src/acl/UrlLogin.cc b/src/acl/UrlLogin.cc
index bdefaf0f9e7c6f5a6f36771658e3747fb3c02d86..5691edadbd5e4503a78fe8f6c22378107abfe3b9 100644 (file)
--- a/src/acl/UrlLogin.cc
+++ b/src/acl/UrlLogin.cc
@@ -31,9 +31,9 @@
  */
 
 #include "squid.h"
-#include "acl/UrlLogin.h"
 #include "acl/Checklist.h"
 #include "acl/RegexData.h"
+#include "acl/UrlLogin.h"
 #include "HttpRequest.h"
 #include "rfc1738.h"
 

diff --git a/src/acl/UrlLogin.h b/src/acl/UrlLogin.h
index 572b3ad3541ebc746b94f63054215d26e284997e..7e64c6aa37472d2a79a8eba4ab1e80e536b989cf 100644 (file)
--- a/src/acl/UrlLogin.h
+++ b/src/acl/UrlLogin.h
@@ -38,8 +38,8 @@
 
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 
 class ACLUrlLoginStrategy : public ACLStrategy<char const *>
 {

diff --git a/src/acl/UrlPath.cc b/src/acl/UrlPath.cc
index 018e20bbc5a6eeef1430f68c1702c568fb26af7b..fdcfdb73819b48ba0d619a34827ec44cae898f18 100644 (file)
--- a/src/acl/UrlPath.cc
+++ b/src/acl/UrlPath.cc
@@ -33,9 +33,9 @@
  */
 
 #include "squid.h"
-#include "acl/UrlPath.h"
 #include "acl/Checklist.h"
 #include "acl/RegexData.h"
+#include "acl/UrlPath.h"
 #include "HttpRequest.h"
 #include "rfc1738.h"
 

diff --git a/src/acl/UrlPath.h b/src/acl/UrlPath.h
index 0ae533d25bce8831a516e3112816b0fdb90a5fcf..d1f9a210e1b8d49b40c22dd2fcca4f90b222c946 100644 (file)
--- a/src/acl/UrlPath.h
+++ b/src/acl/UrlPath.h
@@ -35,8 +35,8 @@
 #define SQUID_ACLURLPATH_H
 #include "acl/Acl.h"
 #include "acl/Data.h"
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 
 class ACLUrlPathStrategy : public ACLStrategy<char const *>
 {

diff --git a/src/acl/UrlPort.cc b/src/acl/UrlPort.cc
index 81cbf474149733b6da20e6f96df88f91d78828e6..1d7b5364421dab5e0b9570a218a8e152d2e08129 100644 (file)
--- a/src/acl/UrlPort.cc
+++ b/src/acl/UrlPort.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "acl/UrlPort.h"
-#include "acl/IntRange.h"
 #include "acl/Checklist.h"
+#include "acl/IntRange.h"
+#include "acl/UrlPort.h"
 #include "HttpRequest.h"
 
 int

diff --git a/src/acl/UrlPort.h b/src/acl/UrlPort.h
index bdc07708ca59643a41078c8a1a5efc764686e20e..2cc894d17ae60a183a5c9f08da929983fc0d1bc8 100644 (file)
--- a/src/acl/UrlPort.h
+++ b/src/acl/UrlPort.h
@@ -33,8 +33,8 @@
 
 #ifndef SQUID_ACLURLPORT_H
 #define SQUID_ACLURLPORT_H
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 
 class ACLUrlPortStrategy : public ACLStrategy<int>
 {

diff --git a/src/acl/UserData.cc b/src/acl/UserData.cc
index e023f3b11311a0b3b1a3ccd78c9767c138dd3186..499400d0e3d21a5d0967e315aac65040d47122e3 100644 (file)
--- a/src/acl/UserData.cc
+++ b/src/acl/UserData.cc
@@ -33,11 +33,11 @@
  */
 
 #include "squid.h"
-#include "acl/UserData.h"
 #include "acl/Checklist.h"
+#include "acl/UserData.h"
+#include "ConfigParser.h"
 #include "Debug.h"
 #include "wordlist.h"
-#include "ConfigParser.h"
 
 template<class T>
 inline void

diff --git a/src/acl/UserData.h b/src/acl/UserData.h
index 39e6374907fa0646f38618e7b524e4c5a021e238..0abec7663365e8fad78f09b59d98475b71cd7442 100644 (file)
--- a/src/acl/UserData.h
+++ b/src/acl/UserData.h
@@ -33,9 +33,9 @@
 
 #ifndef SQUID_ACLUSERDATA_H
 #define SQUID_ACLUSERDATA_H
-#include "splay.h"
 #include "acl/Acl.h"
 #include "acl/Data.h"
+#include "splay.h"
 
 class ACLUserData : public ACLData<char const *>
 {

diff --git a/src/adaptation/AccessCheck.h b/src/adaptation/AccessCheck.h
index fe56065e5826239c3750f40dc4cc6e90f14e8993..cbcda89f8c13836e781d4136fbd65bd43f668327 100644 (file)
--- a/src/adaptation/AccessCheck.h
+++ b/src/adaptation/AccessCheck.h
@@ -2,11 +2,11 @@
 #define SQUID_ADAPTATION__ACCESS_CHECK_H
 
 #include "acl/Acl.h"
-#include "base/AsyncJob.h"
 #include "adaptation/Elements.h"
 #include "adaptation/forward.h"
 #include "adaptation/Initiator.h"
 #include "adaptation/ServiceFilter.h"
+#include "base/AsyncJob.h"
 
 class HttpRequest;
 class HttpReply;

diff --git a/src/adaptation/Config.h b/src/adaptation/Config.h
index 13e84aeb199fe1428c6807026f002f61619a80c6..15d1e5badeb511890aef59951fea059f596f3cc5 100644 (file)
--- a/src/adaptation/Config.h
+++ b/src/adaptation/Config.h
@@ -1,11 +1,11 @@
 #ifndef SQUID_ADAPTATION__CONFIG_H
 #define SQUID_ADAPTATION__CONFIG_H
 
-#include "event.h"
 #include "acl/forward.h"
-#include "base/AsyncCall.h"
-#include "adaptation/forward.h"
 #include "adaptation/Elements.h"
+#include "adaptation/forward.h"
+#include "base/AsyncCall.h"
+#include "event.h"
 #include "Notes.h"
 #include "SquidString.h"
 

diff --git a/src/adaptation/History.h b/src/adaptation/History.h
index 07b3cf312fb9e86cf49bb26c869b91ae2c1b3ea9..1ef64e4cdf0d964a096fa5807664837489052169 100644 (file)
--- a/src/adaptation/History.h
+++ b/src/adaptation/History.h
@@ -2,8 +2,8 @@
 #define SQUID_ADAPT_HISTORY_H
 
 #include "adaptation/DynamicGroupCfg.h"
-#include "base/Vector.h"
 #include "base/RefCount.h"
+#include "base/Vector.h"
 #include "HttpHeader.h"
 #include "Notes.h"
 #include "SquidString.h"

diff --git a/src/adaptation/Initiate.cc b/src/adaptation/Initiate.cc
index 68c2bca3508b5fdcea0168ca0e299b45b9d0fcb2..ebb1c348f87c251889572261d9242c0ee10607b6 100644 (file)
--- a/src/adaptation/Initiate.cc
+++ b/src/adaptation/Initiate.cc
@@ -3,11 +3,11 @@
  */
 
 #include "squid.h"
-#include "HttpMsg.h"
 #include "adaptation/Answer.h"
-#include "adaptation/Initiator.h"
 #include "adaptation/Initiate.h"
+#include "adaptation/Initiator.h"
 #include "base/AsyncJobCalls.h"
+#include "HttpMsg.h"
 
 namespace Adaptation
 {

diff --git a/src/adaptation/Initiate.h b/src/adaptation/Initiate.h
index 39f6a28b9240b01f5a1aa2026e3679e25d871f38..9c1650235e9cc0328d40c4b2e43bfa3ed08199cb 100644 (file)
--- a/src/adaptation/Initiate.h
+++ b/src/adaptation/Initiate.h
@@ -1,9 +1,9 @@
 #ifndef SQUID_ADAPTATION__INITIATE_H
 #define SQUID_ADAPTATION__INITIATE_H
 
+#include "adaptation/forward.h"
 #include "base/AsyncJob.h"
 #include "base/CbcPointer.h"
-#include "adaptation/forward.h"
 
 namespace Adaptation
 {

diff --git a/src/adaptation/Iterator.cc b/src/adaptation/Iterator.cc
index 11505edf2b41d38aa0cc8a9bed870abc81cd031f..3b60e82b15158b3c162149a09fdb0645bcbd05bd 100644 (file)
--- a/src/adaptation/Iterator.cc
+++ b/src/adaptation/Iterator.cc
@@ -10,9 +10,9 @@
 #include "adaptation/ServiceFilter.h"
 #include "adaptation/ServiceGroups.h"
 #include "base/TextException.h"
-#include "HttpRequest.h"
-#include "HttpReply.h"
 #include "HttpMsg.h"
+#include "HttpReply.h"
+#include "HttpRequest.h"
 
 Adaptation::Iterator::Iterator(
     HttpMsg *aMsg, HttpRequest *aCause,

diff --git a/src/adaptation/Iterator.h b/src/adaptation/Iterator.h
index c0d2958bbc5884aeddbfd9b0054771016e27c35c..fda39bb693cad5ec99634f4a3fdd36b9406b6c6a 100644 (file)
--- a/src/adaptation/Iterator.h
+++ b/src/adaptation/Iterator.h
@@ -1,8 +1,8 @@
 #ifndef SQUID_ADAPTATION__ITERATOR_H
 #define SQUID_ADAPTATION__ITERATOR_H
 
-#include "adaptation/Initiator.h"
 #include "adaptation/Initiate.h"
+#include "adaptation/Initiator.h"
 #include "adaptation/ServiceGroups.h"
 
 class HttpMsg;

diff --git a/src/adaptation/Service.cc b/src/adaptation/Service.cc
index 730035db8da53017cbfb10d00e3ddf4c855d52ba..33b60a8b9f70c176d3bddb65a61006391e1d888d 100644 (file)
--- a/src/adaptation/Service.cc
+++ b/src/adaptation/Service.cc
@@ -3,9 +3,9 @@
  */
 
 #include "squid.h"
-#include "HttpRequest.h"
-#include "adaptation/ServiceFilter.h"
 #include "adaptation/Service.h"
+#include "adaptation/ServiceFilter.h"
+#include "HttpRequest.h"
 
 Adaptation::Service::Service(const ServiceConfigPointer &aConfig): theConfig(aConfig)
 {

diff --git a/src/adaptation/Service.h b/src/adaptation/Service.h
index 3b60b4bf51fcd5a0e92e5075340520460d9bd546..1166f1c64b3c60afb7bed52b4c2675f022bffb08 100644 (file)
--- a/src/adaptation/Service.h
+++ b/src/adaptation/Service.h
@@ -1,11 +1,11 @@
 #ifndef SQUID_ADAPTATION__SERVICE_H
 #define SQUID_ADAPTATION__SERVICE_H
 
-#include "SquidString.h"
-#include "adaptation/forward.h"
 #include "adaptation/Elements.h"
+#include "adaptation/forward.h"
 #include "adaptation/ServiceConfig.h"
 #include "base/RefCount.h"
+#include "SquidString.h"
 
 // TODO: Move src/ICAP/ICAPServiceRep.h API comments here and update them
 

diff --git a/src/adaptation/ServiceConfig.h b/src/adaptation/ServiceConfig.h
index 940c45a9655d6b12ced34e94667e076385af8543..1d8cb93a6d362de64bd3fb424679415424b8a678 100644 (file)
--- a/src/adaptation/ServiceConfig.h
+++ b/src/adaptation/ServiceConfig.h
@@ -1,9 +1,9 @@
 #ifndef SQUID_ADAPTATION__SERVICE_CONFIG_H
 #define SQUID_ADAPTATION__SERVICE_CONFIG_H
 
-#include "SquidString.h"
-#include "base/RefCount.h"
 #include "adaptation/Elements.h"
+#include "base/RefCount.h"
+#include "SquidString.h"
 
 namespace Adaptation
 {

diff --git a/src/adaptation/ServiceFilter.cc b/src/adaptation/ServiceFilter.cc
index f488eba8d75c00738b6430f5c432c383f09d219d..25fbfac9f6a088eb6797bee47866876a15d7cbd8 100644 (file)
--- a/src/adaptation/ServiceFilter.cc
+++ b/src/adaptation/ServiceFilter.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
-#include "HttpRequest.h"
-#include "HttpReply.h"
 #include "adaptation/ServiceFilter.h"
+#include "HttpReply.h"
+#include "HttpRequest.h"
 
 Adaptation::ServiceFilter::ServiceFilter(Method aMethod, VectPoint aPoint, HttpRequest *aReq, HttpReply *aRep):
         method(aMethod),

diff --git a/src/adaptation/ServiceGroups.h b/src/adaptation/ServiceGroups.h
index 0fdaf803418d5b3d98c22f74f0badfc17f8921f4..ab7bc6f711f160fc3a1456c0d0f83c04feeb3f78 100644 (file)
--- a/src/adaptation/ServiceGroups.h
+++ b/src/adaptation/ServiceGroups.h
@@ -1,11 +1,11 @@
 #ifndef SQUID_ADAPTATION__SERVICE_GROUPS_H
 #define SQUID_ADAPTATION__SERVICE_GROUPS_H
 
-#include "SquidString.h"
-#include "base/Vector.h"
 #include "adaptation/Elements.h"
 #include "adaptation/forward.h"
 #include "base/RefCount.h"
+#include "base/Vector.h"
+#include "SquidString.h"
 
 namespace Adaptation
 {

diff --git a/src/adaptation/ecap/Config.cc b/src/adaptation/ecap/Config.cc
index 2ed9d5051d0f8415b4145bbd9f69fc608ab8fee9..314b743ddaf2782af8d17e4ba7104a24beab651e 100644 (file)
--- a/src/adaptation/ecap/Config.cc
+++ b/src/adaptation/ecap/Config.cc
@@ -2,9 +2,9 @@
  * DEBUG: section 93    eCAP Interface
  */
 #include "squid.h"
+#include "adaptation/ecap/Config.h"
 #include "adaptation/ecap/Host.h"
 #include "adaptation/ecap/ServiceRep.h"
-#include "adaptation/ecap/Config.h"
 
 Adaptation::Ecap::Config Adaptation::Ecap::TheConfig;
 

diff --git a/src/adaptation/ecap/Host.cc b/src/adaptation/ecap/Host.cc
index df38fed72c6f11a95a123639b63c29b89d7fb157..0883837052f9da332c164b3139cda44bb920612a 100644 (file)
--- a/src/adaptation/ecap/Host.cc
+++ b/src/adaptation/ecap/Host.cc
@@ -5,12 +5,12 @@
 #include <libecap/adapter/service.h>
 #include <libecap/common/names.h>
 #include <libecap/common/registry.h>
-#include "base/TextException.h"
-#include "adaptation/ecap/ServiceRep.h"
 #include "adaptation/ecap/Host.h"
 #include "adaptation/ecap/MessageRep.h"
-#include "HttpRequest.h"
+#include "adaptation/ecap/ServiceRep.h"
+#include "base/TextException.h"
 #include "HttpReply.h"
+#include "HttpRequest.h"
 
 const libecap::Name Adaptation::Ecap::protocolInternal("internal", libecap::Name::NextId());
 const libecap::Name Adaptation::Ecap::protocolCacheObj("cache_object", libecap::Name::NextId());

diff --git a/src/adaptation/ecap/MessageRep.cc b/src/adaptation/ecap/MessageRep.cc
index cf32e6209cb79488d47077ee6f15077776dcfaa2..89512fc6e9345bf0ac30bb05fe10ddcd95ebb8e9 100644 (file)
--- a/src/adaptation/ecap/MessageRep.cc
+++ b/src/adaptation/ecap/MessageRep.cc
@@ -2,16 +2,16 @@
  * DEBUG: section 93    eCAP Interface
  */
 #include "squid.h"
-#include "HttpRequest.h"
-#include "HttpReply.h"
 #include "BodyPipe.h"
+#include "HttpReply.h"
+#include "HttpRequest.h"
 #include <libecap/common/names.h>
 #include <libecap/common/area.h>
 #include <libecap/common/version.h>
 #include <libecap/common/named_values.h>
+#include "adaptation/ecap/Host.h" /* for protocol constants */
 #include "adaptation/ecap/MessageRep.h"
 #include "adaptation/ecap/XactionRep.h"
-#include "adaptation/ecap/Host.h" /* for protocol constants */
 #include "base/TextException.h"
 #include "URL.h"
 

diff --git a/src/adaptation/ecap/MessageRep.h b/src/adaptation/ecap/MessageRep.h
index 9f8d001ad2402d6411e7090d477ead7241df7d21..cfcf739236858de6b0d259a99ac3ed19910b715c 100644 (file)
--- a/src/adaptation/ecap/MessageRep.h
+++ b/src/adaptation/ecap/MessageRep.h
@@ -5,11 +5,11 @@
 #ifndef SQUID__ECAP__MESSAGE_REP_H
 #define SQUID__ECAP__MESSAGE_REP_H
 
-#include "HttpHeader.h"
-#include "BodyPipe.h"
 #include "adaptation/forward.h"
 #include "adaptation/Message.h"
 #include "anyp/ProtocolType.h"
+#include "BodyPipe.h"
+#include "HttpHeader.h"
 #include <libecap/common/message.h>
 #include <libecap/common/header.h>
 #include <libecap/common/body.h>

diff --git a/src/adaptation/ecap/ServiceRep.h b/src/adaptation/ecap/ServiceRep.h
index 1bcc2495dd1b36c16cf86b3467be30c3b209c69d..d3617c0290e818e4ab2b2adab46c15b71fcfca4c 100644 (file)
--- a/src/adaptation/ecap/ServiceRep.h
+++ b/src/adaptation/ecap/ServiceRep.h
@@ -5,8 +5,8 @@
 #ifndef SQUID_ECAP_SERVICE_REP_H
 #define SQUID_ECAP_SERVICE_REP_H
 
-#include "adaptation/Service.h"
 #include "adaptation/forward.h"
+#include "adaptation/Service.h"
 #include <libecap/common/forward.h>
 #include <libecap/common/memory.h>
 

diff --git a/src/adaptation/ecap/XactionRep.cc b/src/adaptation/ecap/XactionRep.cc
index 6090c5e9174fa1298c739b66d3fc49c3b247c161..7ee3f1d9e3dcbfa6d516575b92a21d2fb389ef3b 100644 (file)
--- a/src/adaptation/ecap/XactionRep.cc
+++ b/src/adaptation/ecap/XactionRep.cc
@@ -7,14 +7,14 @@
 #include <libecap/common/named_values.h>
 #include <libecap/common/names.h>
 #include <libecap/adapter/xaction.h>
-#include "HttpRequest.h"
-#include "HttpReply.h"
-#include "SquidTime.h"
 #include "adaptation/Answer.h"
-#include "adaptation/ecap/XactionRep.h"
 #include "adaptation/ecap/Config.h"
+#include "adaptation/ecap/XactionRep.h"
 #include "adaptation/Initiator.h"
 #include "base/TextException.h"
+#include "HttpReply.h"
+#include "HttpRequest.h"
+#include "SquidTime.h"
 
 CBDATA_NAMESPACED_CLASS_INIT(Adaptation::Ecap::XactionRep, XactionRep);
 

diff --git a/src/adaptation/ecap/XactionRep.h b/src/adaptation/ecap/XactionRep.h
index 80f4c6f8eedbcbb2596a90ec46b1a91b887630c3..3c100b05452f226b83d6e0236010b051b941ed09 100644 (file)
--- a/src/adaptation/ecap/XactionRep.h
+++ b/src/adaptation/ecap/XactionRep.h
@@ -5,11 +5,11 @@
 #ifndef SQUID_ECAP_XACTION_REP_H
 #define SQUID_ECAP_XACTION_REP_H
 
-#include "BodyPipe.h"
-#include "adaptation/Initiate.h"
-#include "adaptation/Message.h"
 #include "adaptation/ecap/MessageRep.h"
 #include "adaptation/ecap/ServiceRep.h"
+#include "adaptation/Initiate.h"
+#include "adaptation/Message.h"
+#include "BodyPipe.h"
 #include <libecap/common/forward.h>
 #include <libecap/common/memory.h>
 #include <libecap/host/xaction.h>

diff --git a/src/adaptation/icap/Client.cc b/src/adaptation/icap/Client.cc
index a335b83ea707289229ded8e6838d21c73cb41814..878578e48f3d846a87e97305dfc355a6fae9d165 100644 (file)
--- a/src/adaptation/icap/Client.cc
+++ b/src/adaptation/icap/Client.cc
@@ -1,6 +1,6 @@
 #include "squid.h"
-#include "Debug.h"
 #include "adaptation/icap/Client.h"
+#include "Debug.h"
 
 void Adaptation::Icap::InitModule()
 {

diff --git a/src/adaptation/icap/Config.cc b/src/adaptation/icap/Config.cc
index 3e2288e0c799f8377e121364b246cd2ab80219c1..d66c3f67c940a951960577d173d3a08936af3202 100644 (file)
--- a/src/adaptation/icap/Config.cc
+++ b/src/adaptation/icap/Config.cc
@@ -31,14 +31,14 @@
  */
 
 #include "squid.h"
-#include "ConfigParser.h"
-#include "Store.h"
-#include "base/Vector.h"
 #include "adaptation/icap/Config.h"
 #include "adaptation/icap/ServiceRep.h"
-#include "HttpRequest.h"
+#include "base/Vector.h"
+#include "ConfigParser.h"
 #include "HttpReply.h"
+#include "HttpRequest.h"
 #include "SquidConfig.h"
+#include "Store.h"
 #include "wordlist.h"
 
 Adaptation::Icap::Config Adaptation::Icap::TheConfig;

diff --git a/src/adaptation/icap/Config.h b/src/adaptation/icap/Config.h
index 012efb7e43bf9d7084744cb2e26ef302e9c2a169..5da8ec7adb4e5a6be9b34429f396c369286a48b9 100644 (file)
--- a/src/adaptation/icap/Config.h
+++ b/src/adaptation/icap/Config.h
@@ -34,11 +34,11 @@
 #ifndef SQUID_ICAPCONFIG_H
 #define SQUID_ICAPCONFIG_H
 
-#include "event.h"
-#include "base/AsyncCall.h"
 #include "acl/forward.h"
 #include "adaptation/Config.h"
 #include "adaptation/icap/ServiceRep.h"
+#include "base/AsyncCall.h"
+#include "event.h"
 
 namespace Adaptation
 {

diff --git a/src/adaptation/icap/InOut.h b/src/adaptation/icap/InOut.h
index 4251c93c07067d3e733b997bc3e2967c50a0e6fa..83a6270f118428fe2f5aee4b73cb8747957def2f 100644 (file)
--- a/src/adaptation/icap/InOut.h
+++ b/src/adaptation/icap/InOut.h
@@ -33,8 +33,8 @@
 #define SQUID_ICAPINOUT_H
 
 #include "HttpMsg.h"
-#include "HttpRequest.h"
 #include "HttpReply.h"
+#include "HttpRequest.h"
 
 // IcapInOut manages a pointer to the HTTP message being worked on.
 // For HTTP responses, request header information is also available

diff --git a/src/adaptation/icap/Launcher.cc b/src/adaptation/icap/Launcher.cc
index 1355a9cca08e7f6f67750ac0aa0d006fb1e321ea..7d77f57ee0468c6887231d7a84e330a28115c115 100644 (file)
--- a/src/adaptation/icap/Launcher.cc
+++ b/src/adaptation/icap/Launcher.cc
@@ -5,15 +5,15 @@
 #include "squid.h"
 #include "acl/FilledChecklist.h"
 #include "adaptation/Answer.h"
+#include "adaptation/icap/Config.h"
 #include "adaptation/icap/Launcher.h"
-#include "adaptation/icap/Xaction.h"
 #include "adaptation/icap/ServiceRep.h"
-#include "adaptation/icap/Config.h"
+#include "adaptation/icap/Xaction.h"
 #include "base/TextException.h"
 #include "globals.h"
 #include "HttpMsg.h"
-#include "HttpRequest.h"
 #include "HttpReply.h"
+#include "HttpRequest.h"
 
 Adaptation::Icap::Launcher::Launcher(const char *aTypeName,
                                      Adaptation::ServicePointer &aService):

diff --git a/src/adaptation/icap/Launcher.h b/src/adaptation/icap/Launcher.h
index c70d59767daaec5c80c31f113307724e4a575644..37beb79d312e2ff0dc5804a5ced2b8b4150ac7b1 100644 (file)
--- a/src/adaptation/icap/Launcher.h
+++ b/src/adaptation/icap/Launcher.h
@@ -32,9 +32,9 @@
 #ifndef SQUID_ICAPLAUNCHER_H
 #define SQUID_ICAPLAUNCHER_H
 
-#include "adaptation/Initiator.h"
-#include "adaptation/Initiate.h"
 #include "adaptation/icap/ServiceRep.h"
+#include "adaptation/Initiate.h"
+#include "adaptation/Initiator.h"
 
 /*
  * The ICAP Launcher starts an ICAP transaction. If the transaction fails

diff --git a/src/adaptation/icap/ModXact.h b/src/adaptation/icap/ModXact.h
index e062697e603146a9165123fcc8f9342e99fcf81a..319aa72b217d7e7e0f6be37737db1cf5a52b4d48 100644 (file)
--- a/src/adaptation/icap/ModXact.h
+++ b/src/adaptation/icap/ModXact.h
@@ -32,10 +32,10 @@
 #ifndef SQUID_ICAPMODXACT_H
 #define SQUID_ICAPMODXACT_H
 
-#include "BodyPipe.h"
-#include "adaptation/icap/Xaction.h"
 #include "adaptation/icap/InOut.h"
 #include "adaptation/icap/Launcher.h"
+#include "adaptation/icap/Xaction.h"
+#include "BodyPipe.h"
 
 /*
  * ICAPModXact implements ICAP REQMOD and RESPMOD transaction using

diff --git a/src/adaptation/icap/OptXact.h b/src/adaptation/icap/OptXact.h
index fd366c9077174b3cf6c2e966560a3528c17756be..70dc4952a7bfde7882fa2628fec5d7cd6e02a7ea 100644 (file)
--- a/src/adaptation/icap/OptXact.h
+++ b/src/adaptation/icap/OptXact.h
@@ -31,8 +31,8 @@
 #ifndef SQUID_ICAPOPTXACT_H
 #define SQUID_ICAPOPTXACT_H
 
-#include "adaptation/icap/Xaction.h"
 #include "adaptation/icap/Launcher.h"
+#include "adaptation/icap/Xaction.h"
 
 namespace Adaptation
 {

diff --git a/src/adaptation/icap/ServiceRep.h b/src/adaptation/icap/ServiceRep.h
index 473e3809d1c6f31da0d1d0196ca3b49b738d6ee7..6e1a2b0079fb57768a8f08054341310cdb512d4b 100644 (file)
--- a/src/adaptation/icap/ServiceRep.h
+++ b/src/adaptation/icap/ServiceRep.h
@@ -32,14 +32,14 @@
 #ifndef SQUID_ICAPSERVICEREP_H
 #define SQUID_ICAPSERVICEREP_H
 
-#include "cbdata.h"
-#include "FadingCounter.h"
-#include "adaptation/Service.h"
 #include "adaptation/forward.h"
-#include "adaptation/Initiator.h"
 #include "adaptation/icap/Elements.h"
+#include "adaptation/Initiator.h"
+#include "adaptation/Service.h"
 #include "base/AsyncJobCalls.h"
+#include "cbdata.h"
 #include "comm.h"
+#include "FadingCounter.h"
 #include "pconn.h"
 #include <deque>
 

diff --git a/src/adaptation/icap/Xaction.h b/src/adaptation/icap/Xaction.h
index 0dd6938445d86c4e1a07ce6b7d82efaa00ea8a9e..5074bb8ae0b827c99bed0e86726a1986f18cb30c 100644 (file)
--- a/src/adaptation/icap/Xaction.h
+++ b/src/adaptation/icap/Xaction.h
@@ -32,14 +32,14 @@
 #ifndef SQUID_ICAPXACTION_H
 #define SQUID_ICAPXACTION_H
 
-#include "comm/forward.h"
-#include "CommCalls.h"
-#include "MemBuf.h"
+#include "AccessLogEntry.h"
 #include "adaptation/icap/ServiceRep.h"
 #include "adaptation/Initiate.h"
-#include "AccessLogEntry.h"
+#include "comm/forward.h"
+#include "CommCalls.h"
 #include "HttpReply.h"
 #include "ipcache.h"
+#include "MemBuf.h"
 
 class CommConnectCbParams;
 namespace Comm

diff --git a/src/adaptation/icap/icap_log.cc b/src/adaptation/icap/icap_log.cc
index a3dfe922eddebf09ca80e0e126783c5257060472..7a1f4d93a40d2080ad37d57025053c8b21d7ec6b 100644 (file)
--- a/src/adaptation/icap/icap_log.cc
+++ b/src/adaptation/icap/icap_log.cc
@@ -1,9 +1,9 @@
 #include "squid.h"
-#include "icap_log.h"
 #include "AccessLogEntry.h"
 #include "acl/FilledChecklist.h"
-#include "HttpReply.h"
 #include "globals.h"
+#include "HttpReply.h"
+#include "icap_log.h"
 #include "log/CustomLog.h"
 #include "log/File.h"
 #include "log/Formats.h"

diff --git a/src/auth/Acl.cc b/src/auth/Acl.cc
index 0ca048eba63b58b88ad9474594e37e3a8de4f154..5a6736e3d69165dbd6679fd153b0ed0a5aef5544 100644 (file)
--- a/src/auth/Acl.cc
+++ b/src/auth/Acl.cc
@@ -1,9 +1,9 @@
 #include "squid.h"
 #include "acl/Acl.h"
 #include "acl/FilledChecklist.h"
-#include "auth/UserRequest.h"
 #include "auth/Acl.h"
 #include "auth/AclProxyAuth.h"
+#include "auth/UserRequest.h"
 #include "client_side.h"
 #include "HttpRequest.h"
 

diff --git a/src/auth/AclMaxUserIp.cc b/src/auth/AclMaxUserIp.cc
index 1b197c0e1c214670793ed777710d4af8fa091ed2..0a7072dd0427aa3aeaa6453078706fc6b1703efe 100644 (file)
--- a/src/auth/AclMaxUserIp.cc
+++ b/src/auth/AclMaxUserIp.cc
@@ -8,10 +8,10 @@
 #include "auth/Acl.h"
 #include "auth/AclMaxUserIp.h"
 #include "auth/UserRequest.h"
-#include "Debug.h"
-#include "wordlist.h"
 #include "ConfigParser.h"
+#include "Debug.h"
 #include "Parsing.h"
+#include "wordlist.h"
 
 ACL *
 ACLMaxUserIP::clone() const

diff --git a/src/auth/AclProxyAuth.cc b/src/auth/AclProxyAuth.cc
index f714fec009725f58d7195c9debd0813377db13f2..0c05e5270bf8a8d166ced360452ec14ff2a2f939 100644 (file)
--- a/src/auth/AclProxyAuth.cc
+++ b/src/auth/AclProxyAuth.cc
@@ -33,16 +33,16 @@
  */
 
 #include "squid.h"
-#include "auth/AclProxyAuth.h"
-#include "auth/Gadgets.h"
 #include "acl/FilledChecklist.h"
-#include "acl/UserData.h"
 #include "acl/RegexData.h"
-#include "client_side.h"
-#include "HttpRequest.h"
+#include "acl/UserData.h"
 #include "auth/Acl.h"
+#include "auth/AclProxyAuth.h"
+#include "auth/Gadgets.h"
 #include "auth/User.h"
 #include "auth/UserRequest.h"
+#include "client_side.h"
+#include "HttpRequest.h"
 
 ACLProxyAuth::~ACLProxyAuth()
 {

diff --git a/src/auth/AclProxyAuth.h b/src/auth/AclProxyAuth.h
index fb0854d02cf5b3322e8caf6d148612ecdafc6664..cdcb5aefc63886bb1a7630955bfe72d1053d51f2 100644 (file)
--- a/src/auth/AclProxyAuth.h
+++ b/src/auth/AclProxyAuth.h
@@ -35,8 +35,8 @@
 #if USE_AUTH
 
 #include "acl/Acl.h"
-#include "acl/Data.h"
 #include "acl/Checklist.h"
+#include "acl/Data.h"
 
 class ProxyAuthLookup : public ACLChecklist::AsyncState
 {

diff --git a/src/auth/Gadgets.cc b/src/auth/Gadgets.cc
index a723a6b5628840809e64a7c720237f36ee9dd132..8a025dc5a8be6ada9d3c153972f6b4d34d2fd79e 100644 (file)
--- a/src/auth/Gadgets.cc
+++ b/src/auth/Gadgets.cc
@@ -37,13 +37,13 @@
 #include "squid.h"
 #include "acl/Acl.h"
 #include "acl/FilledChecklist.h"
-#include "client_side.h"
+#include "auth/AclProxyAuth.h"
 #include "auth/Config.h"
-#include "auth/Scheme.h"
 #include "auth/Gadgets.h"
+#include "auth/Scheme.h"
 #include "auth/User.h"
 #include "auth/UserRequest.h"
-#include "auth/AclProxyAuth.h"
+#include "client_side.h"
 #include "globals.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"

diff --git a/src/auth/Gadgets.h b/src/auth/Gadgets.h
index 92a9e6ebe1d41edfa44c6660bf6331c6ebfc2079..c01c1a42fbbc53336aef1b6e812b9405996ed119 100644 (file)
--- a/src/auth/Gadgets.h
+++ b/src/auth/Gadgets.h
@@ -33,10 +33,10 @@
 
 #if USE_AUTH
 
-#include "hash.h"
-#include "MemPool.h"
 #include "auth/Config.h"
 #include "auth/User.h"
+#include "hash.h"
+#include "MemPool.h"
 
 /**
  \ingroup AuthAPI

diff --git a/src/auth/Scheme.cc b/src/auth/Scheme.cc
index 4a09bcfcc4c859375f40c770cd1e960bebe559ce..bce72370c424505ddd90bf83f4bfc2220bd57920 100644 (file)
--- a/src/auth/Scheme.cc
+++ b/src/auth/Scheme.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "auth/Scheme.h"
-#include "auth/Gadgets.h"
 #include "auth/Config.h"
+#include "auth/Gadgets.h"
+#include "auth/Scheme.h"
 #include "globals.h"
 
 Vector<Auth::Scheme::Pointer> *Auth::Scheme::_Schemes = NULL;

diff --git a/src/auth/Scheme.h b/src/auth/Scheme.h
index 1f2ed38aba100242b958a3980d462ff9f2da074c..f5d22fa01f87c81a61e7b35f24c19be39d5382cf 100644 (file)
--- a/src/auth/Scheme.h
+++ b/src/auth/Scheme.h
@@ -33,8 +33,8 @@
 
 #if USE_AUTH
 
-#include "base/Vector.h"
 #include "base/RefCount.h"
+#include "base/Vector.h"
 
 /**
  \defgroup AuthSchemeAPI       Authentication Scheme API

diff --git a/src/auth/User.cc b/src/auth/User.cc
index 95fd1d49e206283c299901a51ac7f2ac5eb48a32..83526f966eebbefe6739b91ea7b022dd7bf3decc 100644 (file)
--- a/src/auth/User.cc
+++ b/src/auth/User.cc
@@ -32,12 +32,12 @@
  */
 
 #include "squid.h"
-#include "auth/User.h"
-#include "auth/UserRequest.h"
-#include "auth/Config.h"
-#include "auth/Gadgets.h"
 #include "acl/Acl.h"
 #include "acl/Gadgets.h"
+#include "auth/Config.h"
+#include "auth/Gadgets.h"
+#include "auth/User.h"
+#include "auth/UserRequest.h"
 #include "event.h"
 #include "globals.h"
 #include "SquidConfig.h"

diff --git a/src/auth/UserRequest.cc b/src/auth/UserRequest.cc
index 9d7761af8e381d6c2bccf14c0b8b54dfdd7beab0..3655db1516668729d4c70db08465d86f3b3949a6 100644 (file)
--- a/src/auth/UserRequest.cc
+++ b/src/auth/UserRequest.cc
@@ -37,8 +37,8 @@
 #include "squid.h"
 #include "auth/Config.h"
 #include "auth/Scheme.h"
-#include "auth/UserRequest.h"
 #include "auth/User.h"
+#include "auth/UserRequest.h"
 #include "client_side.h"
 #include "comm/Connection.h"
 #include "HttpReply.h"

diff --git a/src/auth/UserRequest.h b/src/auth/UserRequest.h
index beed1b994218645abe3e78a922844478b145719e..0bdebdfe4e1b0e537d3636f442b2f928ef21132f 100644 (file)
--- a/src/auth/UserRequest.h
+++ b/src/auth/UserRequest.h
@@ -36,9 +36,9 @@
 #include "auth/Scheme.h"
 #include "auth/User.h"
 #include "dlink.h"
-#include "ip/Address.h"
 #include "helper.h"
 #include "HttpHeader.h"
+#include "ip/Address.h"
 
 class ConnStateData;
 class HttpReply;

diff --git a/src/auth/basic/Scheme.h b/src/auth/basic/Scheme.h
index 607058987ab67df90b6d518b467ca482b702c7a2..bbd217742b168dd9dd13ba36161c29328270ab74 100644 (file)
--- a/src/auth/basic/Scheme.h
+++ b/src/auth/basic/Scheme.h
@@ -31,8 +31,8 @@
 #ifndef SQUID_AUTH_BASIC_SCHEME_H
 #define SQUID_AUTH_BASIC_SCHEME_H
 
-#include "auth/Scheme.h"
 #include "auth/basic/auth_basic.h"
+#include "auth/Scheme.h"
 
 namespace Auth
 {

diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc
index 71002efeab24d379d7840f7249c30a16aea28c55..7ece07ed63d41a0d7d7dabbd18abbbeed2f39444 100644 (file)
--- a/src/auth/basic/auth_basic.cc
+++ b/src/auth/basic/auth_basic.cc
@@ -43,14 +43,14 @@
 #include "auth/State.h"
 #include "cache_cf.h"
 #include "charset.h"
-#include "mgr/Registration.h"
-#include "Store.h"
 #include "HttpHeaderTools.h"
 #include "HttpReply.h"
+#include "mgr/Registration.h"
 #include "rfc1738.h"
+#include "SquidTime.h"
+#include "Store.h"
 #include "uudecode.h"
 #include "wordlist.h"
-#include "SquidTime.h"
 
 /* Basic Scheme */
 static AUTHSSTATS authenticateBasicStats;

diff --git a/src/auth/basic/auth_basic.h b/src/auth/basic/auth_basic.h
index 3e10b21f6d3439315d64b8963a3f339f0e50ff60..0c2e6a4b87f1d5b836a2944b62b51b31dff38057 100644 (file)
--- a/src/auth/basic/auth_basic.h
+++ b/src/auth/basic/auth_basic.h
@@ -6,9 +6,9 @@
 #ifndef __AUTH_BASIC_H__
 #define __AUTH_BASIC_H__
 
+#include "auth/Config.h"
 #include "auth/Gadgets.h"
 #include "auth/UserRequest.h"
-#include "auth/Config.h"
 #include "helper.h"
 
 #define DefaultAuthenticateChildrenMax  32     /* 32 processes */

diff --git a/src/auth/digest/Scheme.h b/src/auth/digest/Scheme.h
index 30e2f4dbb46daa01b23efb6ba33b344cb7aba0d0..6b34665772c43e4291c58faf3151e7feb6909f72 100644 (file)
--- a/src/auth/digest/Scheme.h
+++ b/src/auth/digest/Scheme.h
@@ -31,8 +31,8 @@
 #ifndef SQUID_AUTH_DIGEST_SCHEME_H
 #define SQUID_AUTH_DIGEST_SCHEME_H
 
-#include "auth/Scheme.h"
 #include "auth/digest/auth_digest.h"
+#include "auth/Scheme.h"
 
 namespace Auth
 {

diff --git a/src/auth/digest/UserRequest.h b/src/auth/digest/UserRequest.h
index 6c328ed933ed2100f884da4ba37c7df634ef4828..55787a283717b3c7ea8db3088287206318031609 100644 (file)
--- a/src/auth/digest/UserRequest.h
+++ b/src/auth/digest/UserRequest.h
@@ -1,8 +1,8 @@
 #ifndef _SQUID_SRC_AUTH_DIGEST_USERREQUEST_H
 #define _SQUID_SRC_AUTH_DIGEST_USERREQUEST_H
 
-#include "auth/UserRequest.h"
 #include "auth/digest/auth_digest.h"
+#include "auth/UserRequest.h"
 #include "MemPool.h"
 
 class ConnStateData;

diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc
index f9609c842a1818f7673835db3a49e5e0d6a67c46..b1a3237920072221042bbf4f9eb464d7ca86cbef 100644 (file)
--- a/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@ -35,25 +35,25 @@
  * See acl.c for access control and client_side.c for auditing */
 
 #include "squid.h"
-#include "cache_cf.h"
-#include "rfc2617.h"
 #include "auth/digest/auth_digest.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 "base64.h"
 #include "base/StringArea.h"
+#include "base64.h"
+#include "cache_cf.h"
 #include "event.h"
 #include "HttpHeaderTools.h"
-#include "mgr/Registration.h"
-#include "Store.h"
-#include "HttpRequest.h"
 #include "HttpReply.h"
-#include "wordlist.h"
+#include "HttpRequest.h"
+#include "mgr/Registration.h"
+#include "rfc2617.h"
 #include "SquidTime.h"
+#include "Store.h"
 #include "StrList.h"
+#include "wordlist.h"
 
 /* Digest Scheme */
 

diff --git a/src/auth/negotiate/Scheme.h b/src/auth/negotiate/Scheme.h
index c4bfa2ebb0fd9b18997ed96a96e6c994d6914d17..9b482548616c19cf35523d828d7204e0d21e8f5e 100644 (file)
--- a/src/auth/negotiate/Scheme.h
+++ b/src/auth/negotiate/Scheme.h
@@ -31,8 +31,8 @@
 #ifndef SQUID_AUTH_NEGOTIATE_SCHEME_H
 #define SQUID_AUTH_NEGOTIATE_SCHEME_H
 
-#include "auth/Scheme.h"
 #include "auth/negotiate/auth_negotiate.h"
+#include "auth/Scheme.h"
 
 namespace Auth
 {

diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc
index dd0b75f114e3aaa7a9b56712a3c0a567c518d4c9..2455e6f2cb4b5a3ae81e8088da13149b5e46dbdf 100644 (file)
--- a/src/auth/negotiate/auth_negotiate.cc
+++ b/src/auth/negotiate/auth_negotiate.cc
@@ -35,20 +35,20 @@
  * See acl.c for access control and client_side.c for auditing */
 
 #include "squid.h"
-#include "auth/negotiate/auth_negotiate.h"
 #include "auth/Gadgets.h"
+#include "auth/negotiate/auth_negotiate.h"
+#include "auth/negotiate/Scheme.h"
+#include "auth/negotiate/User.h"
+#include "auth/negotiate/UserRequest.h"
 #include "auth/State.h"
 #include "cache_cf.h"
-#include "mgr/Registration.h"
-#include "Store.h"
 #include "client_side.h"
 #include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
+#include "mgr/Registration.h"
 #include "SquidTime.h"
-#include "auth/negotiate/Scheme.h"
-#include "auth/negotiate/User.h"
-#include "auth/negotiate/UserRequest.h"
+#include "Store.h"
 #include "wordlist.h"
 
 /**

diff --git a/src/auth/ntlm/Scheme.h b/src/auth/ntlm/Scheme.h
index 9bab40109c18fca5de00469cbccdd7da50c41506..034ff07bb330d3e268dc243fb232ced64a5c3d79 100644 (file)
--- a/src/auth/ntlm/Scheme.h
+++ b/src/auth/ntlm/Scheme.h
@@ -31,8 +31,8 @@
 #ifndef SQUID_AUTH_NTLM_SCHEME_H
 #define SQUID_AUTH_NTLM_SCHEME_H
 
-#include "auth/Scheme.h"
 #include "auth/ntlm/auth_ntlm.h"
+#include "auth/Scheme.h"
 
 namespace Auth
 {

diff --git a/src/auth/ntlm/UserRequest.h b/src/auth/ntlm/UserRequest.h
index 396e86038cf009e8fe98e097829dbc66b23f1204..b353c416c766e92f846ec2947ad6ab43de5ef5ea 100644 (file)
--- a/src/auth/ntlm/UserRequest.h
+++ b/src/auth/ntlm/UserRequest.h
@@ -1,8 +1,8 @@
 #ifndef _SQUID_SRC_AUTH_NTLM_USERREQUEST_H
 #define _SQUID_SRC_AUTH_NTLM_USERREQUEST_H
 
-#include "auth/UserRequest.h"
 #include "auth/ntlm/auth_ntlm.h"
+#include "auth/UserRequest.h"
 #include "MemPool.h"
 
 class ConnStateData;

diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc
index 34b1478c81827e71e41758bb01e728fcec7c712a..4515183e3b9ff8ee32cfe652561a452cded8644c 100644 (file)
--- a/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@ -42,14 +42,14 @@
 #include "auth/ntlm/UserRequest.h"
 #include "auth/State.h"
 #include "cache_cf.h"
-#include "mgr/Registration.h"
-#include "Store.h"
 #include "client_side.h"
 #include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
-#include "wordlist.h"
+#include "mgr/Registration.h"
 #include "SquidTime.h"
+#include "Store.h"
+#include "wordlist.h"
 
 /* NTLM Scheme */
 static AUTHSSTATS authenticateNTLMStats;

diff --git a/src/auth/ntlm/auth_ntlm.h b/src/auth/ntlm/auth_ntlm.h
index b19e1c85699d6e49adba1ee11b90f0a94e5abe4c..04c0c43c7d2d27307d6cc335f7e815cb12d28f0f 100644 (file)
--- a/src/auth/ntlm/auth_ntlm.h
+++ b/src/auth/ntlm/auth_ntlm.h
@@ -5,9 +5,9 @@
 
 #ifndef __AUTH_NTLM_H__
 #define __AUTH_NTLM_H__
+#include "auth/Config.h"
 #include "auth/Gadgets.h"
 #include "auth/UserRequest.h"
-#include "auth/Config.h"
 #include "helper.h"
 
 #define DefaultAuthenticateChildrenMax  32     /* 32 processes */

diff --git a/src/base/AsyncCallQueue.cc b/src/base/AsyncCallQueue.cc
index a058f8db46d044d144af0bc97cffd7ea666af8b7..58be965b5389832761201dd82dd80dc1f9e5129b 100644 (file)
--- a/src/base/AsyncCallQueue.cc
+++ b/src/base/AsyncCallQueue.cc
@@ -5,8 +5,8 @@
  */
 
 #include "squid.h"
-#include "base/AsyncCallQueue.h"
 #include "base/AsyncCall.h"
+#include "base/AsyncCallQueue.h"
 #include "Debug.h"
 
 AsyncCallQueue *AsyncCallQueue::TheInstance = 0;

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 330412ca2af5013010f92a16abc835162a07d389..667b7b3b82abce9fa9a3b1ea3e06aa40f05953b7 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -42,10 +42,9 @@
 #include "anyp/PortCfg.h"
 #include "AuthReg.h"
 #include "base/RunnersRegistry.h"
-#include "mgr/ActionPasswordList.h"
+#include "cache_cf.h"
 #include "CachePeer.h"
 #include "CachePeerDomainList.h"
-#include "cache_cf.h"
 #include "ConfigParser.h"
 #include "CpuAffinityMap.h"
 #include "DiskIO/DiskIOModule.h"
@@ -64,7 +63,9 @@
 #include "log/CustomLog.h"
 #include "Mem.h"
 #include "MemBuf.h"
+#include "mgr/ActionPasswordList.h"
 #include "mgr/Registration.h"
+#include "neighbors.h"
 #include "NeighborTypeDomainList.h"
 #include "Parsing.h"
 #include "PeerDigest.h"
@@ -76,10 +77,9 @@
 #include "Store.h"
 #include "StoreFileSystem.h"
 #include "SwapDir.h"
-#include "wordlist.h"
-#include "neighbors.h"
 #include "tools.h"
 #include "URLScheme.h"
+#include "wordlist.h"
 /* wccp2 has its own conditional definitions */
 #include "wccp2.h"
 #if USE_ADAPTATION
@@ -92,8 +92,8 @@
 #include "adaptation/ecap/Config.h"
 #endif
 #if USE_SSL
-#include "ssl/support.h"
 #include "ssl/Config.h"
+#include "ssl/support.h"
 #endif
 #if USE_AUTH
 #include "auth/Config.h"
@@ -1648,8 +1648,8 @@ free_acl_b_size_t(AclSizeLimit ** head)
 
 #if USE_DELAY_POOLS
 
-#include "DelayPools.h"
 #include "DelayConfig.h"
+#include "DelayPools.h"
 /* do nothing - free_delay_pool_count is the magic free function.
  * this is why delay_pool_count isn't just marked TYPE: u_short
  */

diff --git a/src/cache_manager.cc b/src/cache_manager.cc
index 9d881b5cf463989aa7a5029f3b95e7ec59334735..66976cd916991b95294ecddafd10fa1d4e5db021 100644 (file)
--- a/src/cache_manager.cc
+++ b/src/cache_manager.cc
@@ -32,7 +32,6 @@
 
 #include "squid.h"
 #include "base/TextException.h"
-#include "mgr/ActionPasswordList.h"
 #include "CacheManager.h"
 #include "comm/Connection.h"
 #include "Debug.h"
@@ -40,8 +39,9 @@
 #include "fde.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
-#include "mgr/ActionCreator.h"
 #include "mgr/Action.h"
+#include "mgr/ActionCreator.h"
+#include "mgr/ActionPasswordList.h"
 #include "mgr/ActionProfile.h"
 #include "mgr/BasicActions.h"
 #include "mgr/Command.h"
@@ -49,10 +49,10 @@
 #include "mgr/FunAction.h"
 #include "mgr/QueryParams.h"
 #include "protos.h"
-#include "tools.h"
 #include "SquidConfig.h"
 #include "SquidTime.h"
 #include "Store.h"
+#include "tools.h"
 #include "wordlist.h"
 
 #include <algorithm>

diff --git a/src/clientStream.cc b/src/clientStream.cc
index 3624e39f808d4e34dd2394ce393e3914b7af7342..6452835a349048397b7e3cfa8c0064d32d99fb5c 100644 (file)
--- a/src/clientStream.cc
+++ b/src/clientStream.cc
@@ -32,10 +32,10 @@
  */
 
 #include "squid.h"
+#include "client_side_request.h"
 #include "clientStream.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
-#include "client_side_request.h"
 
 /**
  \defgroup ClientStreamInternal Client Streams Internals

diff --git a/src/client_db.cc b/src/client_db.cc
index fb737b21e73e8507c53c93ba9ab42bbd19746f4d..1f6eb6ebf64a0df2847cc5610df2ee7216151e01 100644 (file)
--- a/src/client_db.cc
+++ b/src/client_db.cc
@@ -32,9 +32,9 @@
 
 #include "squid.h"
 #include "client_db.h"
+#include "ClientInfo.h"
 #include "event.h"
 #include "format/Token.h"
-#include "ClientInfo.h"
 #include "fqdncache.h"
 #include "ip/Address.h"
 #include "log/access_log.h"

diff --git a/src/client_side.cc b/src/client_side.cc
index 1f402207b76a6552848d8e1861bd373cfe7a39f6..24c8147e37c86e5564dc12c32a526bb1b4590bc8 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -86,9 +86,9 @@
 #include "CachePeer.h"
 #include "ChunkedCodingParser.h"
 #include "client_db.h"
+#include "client_side.h"
 #include "client_side_reply.h"
 #include "client_side_request.h"
-#include "client_side.h"
 #include "ClientRequestContext.h"
 #include "clientStream.h"
 #include "comm.h"
@@ -136,16 +136,16 @@
 #include "ClientInfo.h"
 #endif
 #if USE_SSL
-#include "ssl/ProxyCerts.h"
 #include "ssl/context_storage.h"
+#include "ssl/gadgets.h"
 #include "ssl/helper.h"
+#include "ssl/ProxyCerts.h"
 #include "ssl/ServerBump.h"
 #include "ssl/support.h"
-#include "ssl/gadgets.h"
 #endif
 #if USE_SSL_CRTD
-#include "ssl/crtd_message.h"
 #include "ssl/certificate_db.h"
+#include "ssl/crtd_message.h"
 #endif
 
 #if HAVE_LIMITS_H

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index 0f6a39b5b125d77bf1ab9abb6d60ec475df36a5e..ee815d0c4c89706529b46557056fb49c62e45768 100644 (file)
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -43,10 +43,10 @@
 #include "acl/FilledChecklist.h"
 #include "acl/Gadgets.h"
 #include "anyp/PortCfg.h"
-#include "ClientRequestContext.h"
 #include "client_side.h"
 #include "client_side_reply.h"
 #include "client_side_request.h"
+#include "ClientRequestContext.h"
 #include "clientStream.h"
 #include "comm/Connection.h"
 #include "comm/Write.h"
@@ -62,8 +62,8 @@
 #include "HttpHdrCc.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
-#include "ipcache.h"
 #include "ip/QosConfig.h"
+#include "ipcache.h"
 #include "log/access_log.h"
 #include "MemObject.h"
 #include "Parsing.h"
@@ -89,8 +89,8 @@
 #endif
 #endif
 #if USE_SSL
-#include "ssl/support.h"
 #include "ssl/ServerBump.h"
+#include "ssl/support.h"
 #endif
 
 #if LINGERING_CLOSE

diff --git a/src/client_side_request.h b/src/client_side_request.h
index 509d9a1934e03c3b66b0e710963d07d6b47c5cf7..e4744ab8de660ed3439b06f0f66e448579ba3efc 100644 (file)
--- a/src/client_side_request.h
+++ b/src/client_side_request.h
@@ -30,10 +30,10 @@
 #ifndef SQUID_CLIENTSIDEREQUEST_H
 #define SQUID_CLIENTSIDEREQUEST_H
 
-#include "acl/forward.h"
 #include "AccessLogEntry.h"
-#include "clientStream.h"
+#include "acl/forward.h"
 #include "client_side.h"
+#include "clientStream.h"
 #include "HttpHeaderRange.h"
 #include "LogTags.h"
 
@@ -205,8 +205,8 @@ void clientAccessCheck(ClientHttpRequest *);
 void tunnelStart(ClientHttpRequest *, int64_t *, int *, const AccessLogEntry::Pointer &al);
 
 #if _USE_INLINE_
-#include "Store.h"
 #include "client_side_request.cci"
+#include "Store.h"
 #endif
 
 #endif /* SQUID_CLIENTSIDEREQUEST_H */

diff --git a/src/comm.cc b/src/comm.cc
index dd9d5717a5b82fdf14f8076ca620e50dfde68cce..017a4c33154a0a4594aef9b6d8953505bfaaeda0 100644 (file)
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -39,8 +39,8 @@
 #include "comm/Connection.h"
 #include "comm/IoCallback.h"
 #include "comm/Loops.h"
-#include "comm/Write.h"
 #include "comm/TcpAcceptor.h"
+#include "comm/Write.h"
 #include "CommRead.h"
 #include "compat/cmsg.h"
 #include "DescriptorSet.h"

diff --git a/src/comm.h b/src/comm.h
index 571c1b310e1549622fb109f79935ca3266a40246..8c5b04ea91af5a30721dccb39d55cacaddf4c2f5 100644 (file)
--- a/src/comm.h
+++ b/src/comm.h
@@ -1,8 +1,8 @@
 #ifndef __COMM_H__
 #define __COMM_H__
 
-#include "CommCalls.h"
 #include "comm/IoCallback.h"
+#include "CommCalls.h"
 #include "StoreIOBuffer.h"
 
 namespace Ip

diff --git a/src/comm/ConnOpener.cc b/src/comm/ConnOpener.cc
index 4c95f37b193844f91824d7d7e47eaa1937c3d125..c2913dbc55496aa456ffb59b16028f157f00921c 100644 (file)
--- a/src/comm/ConnOpener.cc
+++ b/src/comm/ConnOpener.cc
@@ -4,16 +4,16 @@
 
 #include "squid.h"
 #include "CachePeer.h"
-#include "comm/ConnOpener.h"
+#include "comm.h"
 #include "comm/Connection.h"
+#include "comm/ConnOpener.h"
 #include "comm/Loops.h"
-#include "comm.h"
 #include "fd.h"
 #include "fde.h"
 #include "globals.h"
 #include "icmp/net_db.h"
-#include "ipcache.h"
 #include "ip/tools.h"
+#include "ipcache.h"
 #include "SquidConfig.h"
 #include "SquidTime.h"
 

diff --git a/src/comm/ConnOpener.h b/src/comm/ConnOpener.h
index f4dce459de89adc958557348f2869ee79ba31624..003b474908b9836e68fcbfcb2326d4c0a7dbd640 100644 (file)
--- a/src/comm/ConnOpener.h
+++ b/src/comm/ConnOpener.h
@@ -4,9 +4,9 @@
 #include "base/AsyncCall.h"
 #include "base/AsyncJob.h"
 #include "cbdata.h"
-#include "CommCalls.h"
-#include "comm_err_t.h"
 #include "comm/forward.h"
+#include "comm_err_t.h"
+#include "CommCalls.h"
 
 namespace Comm
 {

diff --git a/src/comm/ModSelect.cc b/src/comm/ModSelect.cc
index 81e8a29839be1131be37ec1eae739962694fe642..47c822566983a114fea20d8931aa61c7dc9f6f17 100644 (file)
--- a/src/comm/ModSelect.cc
+++ b/src/comm/ModSelect.cc
@@ -39,11 +39,11 @@
 #include "globals.h"
 #include "ICP.h"
 #include "mgr/Registration.h"
+#include "SquidConfig.h"
 #include "SquidTime.h"
 #include "StatCounters.h"
 #include "StatHist.h"
 #include "Store.h"
-#include "SquidConfig.h"
 
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>

diff --git a/src/comm/TcpAcceptor.cc b/src/comm/TcpAcceptor.cc
index 33cf3fbd7fe01591453c01763a16cf0341736119..d0d3709c317bb4f60697fb8631d33984094a572f 100644 (file)
--- a/src/comm/TcpAcceptor.cc
+++ b/src/comm/TcpAcceptor.cc
@@ -37,11 +37,11 @@
 #include "base/TextException.h"
 #include "client_db.h"
 #include "comm/AcceptLimiter.h"
-#include "CommCalls.h"
 #include "comm/comm_internal.h"
 #include "comm/Connection.h"
 #include "comm/Loops.h"
 #include "comm/TcpAcceptor.h"
+#include "CommCalls.h"
 #include "eui/Config.h"
 #include "fd.h"
 #include "fde.h"

diff --git a/src/comm/TcpAcceptor.h b/src/comm/TcpAcceptor.h
index 48aee211eeb0d92fed8c4f2400dd7765e5f9b4d5..ee3b392cd15961846da13cd7a4ff77cb4b728234 100644 (file)
--- a/src/comm/TcpAcceptor.h
+++ b/src/comm/TcpAcceptor.h
@@ -4,8 +4,8 @@
 #include "base/AsyncJob.h"
 #include "base/CbcPointer.h"
 #include "base/Subscription.h"
-#include "comm_err_t.h"
 #include "comm/forward.h"
+#include "comm_err_t.h"
 
 namespace Comm
 {

diff --git a/src/comm/forward.h b/src/comm/forward.h
index 104d7a7820d69aaac5670ed558b61789741ad2f5..711c546814edeedb0b378b3fcc5f2a8d120bde9e 100644 (file)
--- a/src/comm/forward.h
+++ b/src/comm/forward.h
@@ -1,8 +1,8 @@
 #ifndef _SQUID_COMM_FORWARD_H
 #define _SQUID_COMM_FORWARD_H
 
-#include "base/Vector.h"
 #include "base/RefCount.h"
+#include "base/Vector.h"
 
 namespace Comm
 {

diff --git a/src/debug.cc b/src/debug.cc
index 7320fe9ad374392356b6480aaa1c18d94b288f75..ec3a99877104c13eca030fccdd1acf3855fa8790 100644 (file)
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -32,9 +32,9 @@
 
 #include "squid.h"
 #include "Debug.h"
+#include "ipc/Kids.h"
 #include "SquidTime.h"
 #include "util.h"
-#include "ipc/Kids.h"
 
 /* for shutting_down flag in xassert() */
 #include "globals.h"

diff --git a/src/delay_pools.cc b/src/delay_pools.cc
index bcc6ad769104f0e0abdf479c111a26b2f61293a2..96489686ebfcc56782088ca33b246457bc174315 100644 (file)
--- a/src/delay_pools.cc
+++ b/src/delay_pools.cc
@@ -63,8 +63,8 @@
 #include "NullDelayId.h"
 #include "SquidString.h"
 #include "SquidTime.h"
-#include "StoreClient.h"
 #include "Store.h"
+#include "StoreClient.h"
 
 /// \ingroup DelayPoolsInternal
 long DelayPools::MemoryUsed = 0;

diff --git a/src/dns_internal.cc b/src/dns_internal.cc
index 4122a1dbb0c603c65786a5b39f418af4b7d50a98..fd3c43facde8f4bd717571ac1ad6298c23adce2d 100644 (file)
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -32,9 +32,9 @@
 
 #include "squid.h"
 #include "base/InstanceId.h"
+#include "comm.h"
 #include "comm/Connection.h"
 #include "comm/ConnOpener.h"
-#include "comm.h"
 #include "comm/Loops.h"
 #include "comm/Write.h"
 #include "dlink.h"

diff --git a/src/errorpage.cc b/src/errorpage.cc
index edea909c663960831ead6c96e3d3d0f76a4662bf..65b92ac2471f6299616e6a800d4b4304f6d8f895 100644 (file)
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@ -36,21 +36,21 @@
 #include "disk.h"
 #include "err_detail_type.h"
 #include "errorpage.h"
+#include "fde.h"
 #include "ftp.h"
-#include "Store.h"
 #include "html_quote.h"
 #include "HttpHeaderTools.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
-#include "MemObject.h"
-#include "fde.h"
 #include "MemBuf.h"
+#include "MemObject.h"
 #include "rfc1738.h"
 #include "SquidConfig.h"
+#include "Store.h"
+#include "tools.h"
 #include "URL.h"
-#include "URLScheme.h"
 #include "URL.h"
-#include "tools.h"
+#include "URLScheme.h"
 #include "wordlist.h"
 #if USE_AUTH
 #include "auth/UserRequest.h"

diff --git a/src/esi/Context.cc b/src/esi/Context.cc
index 4b321afd46e0c41220042a08fa11740874a776f5..870c33bd168e2aa9a2508455f9b33ec9921a913b 100644 (file)
--- a/src/esi/Context.cc
+++ b/src/esi/Context.cc
@@ -38,9 +38,9 @@
  */
 #if (USE_SQUID_ESI == 1)
 
+#include "client_side_request.h"
 #include "esi/Context.h"
 #include "Store.h"
-#include "client_side_request.h"
 
 void
 ESIContext::updateCachedAST()

diff --git a/src/esi/Context.h b/src/esi/Context.h
index 7f8012dfbdd1c5fa227c6301f28e6edf568cd59d..801de17318ff21a1f7bce07a5eb020e35f5eae97 100644 (file)
--- a/src/esi/Context.h
+++ b/src/esi/Context.h
@@ -32,10 +32,10 @@
 #ifndef SQUID_ESICONTEXT_H
 #define SQUID_ESICONTEXT_H
 
-#include "esi/Parser.h"
-#include "esi/Element.h"
 #include "clientStream.h"
 #include "err_type.h"
+#include "esi/Element.h"
+#include "esi/Parser.h"
 #include "http/StatusCode.h"
 
 class ESIVarState;

diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc
index effb2a646507eafe89778fc7b0e0aa7dadd366fb..8f632ca79f0e10ef4e63c80f594356c77a3afebb 100644 (file)
--- a/src/esi/CustomParser.cc
+++ b/src/esi/CustomParser.cc
@@ -33,8 +33,8 @@
 
 #include "squid.h"
 #include "base/Vector.h"
-#include "esi/CustomParser.h"
 #include "Debug.h"
+#include "esi/CustomParser.h"
 #include "libTrie/Trie.h"
 #include "libTrie/TrieCharTransform.h"
 

diff --git a/src/esi/Esi.cc b/src/esi/Esi.cc
index 480453d54f542f1c70bba2f6a51725ac383c0bc0..bfdd18ddc3ed93fcb4926889b37312c75034530b 100644 (file)
--- a/src/esi/Esi.cc
+++ b/src/esi/Esi.cc
@@ -38,8 +38,8 @@
  */
 #if (USE_SQUID_ESI == 1)
 
-#include "client_side_request.h"
 #include "client_side.h"
+#include "client_side_request.h"
 #include "clientStream.h"
 #include "comm/Connection.h"
 #include "errorpage.h"

diff --git a/src/esi/Include.cc b/src/esi/Include.cc
index 46d441a1d598bb8d4573868eef8d3beea51e17ef..120f71beff14a7233279b77d42c07f71fb908523 100644 (file)
--- a/src/esi/Include.cc
+++ b/src/esi/Include.cc
@@ -39,8 +39,8 @@
  */
 #if (USE_SQUID_ESI == 1)
 
-#include "client_side_request.h"
 #include "client_side.h"
+#include "client_side_request.h"
 #include "esi/Include.h"
 #include "esi/VarState.h"
 #include "HttpReply.h"

diff --git a/src/esi/Module.cc b/src/esi/Module.cc
index 64da18979abe4eee009d322d964f381cee4d5aae..abeb1f94174cb3e8fdd4739a1e33d647e3e2baac 100644 (file)
--- a/src/esi/Module.cc
+++ b/src/esi/Module.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
-#include "esi/Module.h"
 #include "esi/CustomParser.h"
 #include "esi/Libxml2Parser.h"
+#include "esi/Module.h"
 /* include for esi/ExpatParser.h must follow esi/Libxml2Parser.h */
 /* do not remove this comment, as it acts as barrier for the autmatic sorting */
 #include "esi/ExpatParser.h"

diff --git a/src/esi/Sequence.cc b/src/esi/Sequence.cc
index 75c794d8a59331477cbc4a6329e8f06fcd41928c..94b373f0d60ea71fabb3c5781a9efd19ab344b1d 100644 (file)
--- a/src/esi/Sequence.cc
+++ b/src/esi/Sequence.cc
@@ -40,10 +40,10 @@
  */
 #if (USE_SQUID_ESI == 1)
 
-#include "esi/Sequence.h"
-#include "esi/Literal.h"
 #include "esi/Attempt.h"
 #include "esi/Except.h"
+#include "esi/Literal.h"
+#include "esi/Sequence.h"
 
 class esiExcept;
 

diff --git a/src/esi/VarState.h b/src/esi/VarState.h
index 0a538fb49466a1a975ebb3e7b60958fb2cfb7ea2..7a00daf244df63c69eb4b2452c205d95219af371 100644 (file)
--- a/src/esi/VarState.h
+++ b/src/esi/VarState.h
@@ -32,10 +32,10 @@
 #ifndef SQUID_ESIVARSTATE_H
 #define SQUID_ESIVARSTATE_H
 
-#include "esi/Segment.h"
-#include "libTrie/Trie.h"
 #include "base/Vector.h"
+#include "esi/Segment.h"
 #include "HttpHeader.h"
+#include "libTrie/Trie.h"
 
 class HttpReply;
 

diff --git a/src/event.cc b/src/event.cc
index a812705904251460f38a5ca048e4a2f2600efc86..12db66a9b82489df610d20bee85b0e214036b7c4 100644 (file)
--- a/src/event.cc
+++ b/src/event.cc
@@ -34,9 +34,9 @@
 #include "compat/drand48.h"
 #include "event.h"
 #include "mgr/Registration.h"
-#include "Store.h"
-#include "SquidTime.h"
 #include "profiler/Profiler.h"
+#include "SquidTime.h"
+#include "Store.h"
 #include "tools.h"
 
 /* The list of event processes */

diff --git a/src/event.h b/src/event.h
index e35460d4489163bfe3059fdb90b5852867f566a4..ed66a9e0cf40e55c7c629cc541e14a77276eeb4a 100644 (file)
--- a/src/event.h
+++ b/src/event.h
@@ -32,8 +32,8 @@
 #ifndef SQUID_EVENT_H
 #define SQUID_EVENT_H
 
-#include "base/Vector.h"
 #include "AsyncEngine.h"
+#include "base/Vector.h"
 #include "MemPool.h"
 
 class StoreEntry;

diff --git a/src/format/Config.cc b/src/format/Config.cc
index cb955a0bd8a2a5fc7a9fbfc9ec50d21ffeed6f78..c0cfb2fc98b9c3d915a3903fb3f23356d484b457 100644 (file)
--- a/src/format/Config.cc
+++ b/src/format/Config.cc
@@ -1,6 +1,6 @@
 #include "squid.h"
-#include "ConfigParser.h"
 #include "cache_cf.h"
+#include "ConfigParser.h"
 #include "Debug.h"
 #include "format/Config.h"
 #include <list>

diff --git a/src/fs/rock/RockIoState.cc b/src/fs/rock/RockIoState.cc
index a682fb5128573aa6a5258cfb5c97490edd41cb1d..8190f28e9c10c2c2f7361c239601e4820477b084 100644 (file)
--- a/src/fs/rock/RockIoState.cc
+++ b/src/fs/rock/RockIoState.cc
@@ -3,15 +3,15 @@
  */
 
 #include "squid.h"
-#include "MemObject.h"
-#include "Parsing.h"
 #include "DiskIO/DiskIOModule.h"
 #include "DiskIO/DiskIOStrategy.h"
 #include "DiskIO/WriteRequest.h"
-#include "fs/rock/RockIoState.h"
 #include "fs/rock/RockIoRequests.h"
+#include "fs/rock/RockIoState.h"
 #include "fs/rock/RockSwapDir.h"
 #include "globals.h"
+#include "MemObject.h"
+#include "Parsing.h"
 
 Rock::IoState::IoState(SwapDir *dir,
                        StoreEntry *anEntry,

diff --git a/src/fs/rock/RockRebuild.cc b/src/fs/rock/RockRebuild.cc
index 8f07ded9d9faa8633720a6825baf969c428db3c7..aca7d890591e9bbd0f7f20935089576ce3c0c310 100644 (file)
--- a/src/fs/rock/RockRebuild.cc
+++ b/src/fs/rock/RockRebuild.cc
@@ -4,15 +4,15 @@
 
 #include "squid.h"
 #include "disk.h"
+#include "fs/rock/RockDbCell.h"
 #include "fs/rock/RockRebuild.h"
 #include "fs/rock/RockSwapDir.h"
-#include "fs/rock/RockDbCell.h"
 #include "globals.h"
 #include "md5.h"
-#include "tools.h"
-#include "typedefs.h"
 #include "SquidTime.h"
 #include "store_rebuild.h"
+#include "tools.h"
+#include "typedefs.h"
 
 #if HAVE_ERRNO_H
 #include <errno.h>

diff --git a/src/fs/rock/RockSwapDir.cc b/src/fs/rock/RockSwapDir.cc
index 7f4526b367cbe82b83b383672cc616e033f1dbec..88183253c1463516173bb97d5fa947b21a6c39a1 100644 (file)
--- a/src/fs/rock/RockSwapDir.cc
+++ b/src/fs/rock/RockSwapDir.cc
@@ -9,10 +9,10 @@
 #include "DiskIO/DiskIOStrategy.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
-#include "fs/rock/RockSwapDir.h"
-#include "fs/rock/RockIoState.h"
 #include "fs/rock/RockIoRequests.h"
+#include "fs/rock/RockIoState.h"
 #include "fs/rock/RockRebuild.h"
+#include "fs/rock/RockSwapDir.h"
 #include "globals.h"
 #include "ipc/mem/Pages.h"
 #include "MemObject.h"

diff --git a/src/fs/rock/RockSwapDir.h b/src/fs/rock/RockSwapDir.h
index 165fa2cfc14f03745ca265249356464eec04b4f1..00cb22ca87beb4e5c589fe5411eb08bf5e095524 100644 (file)
--- a/src/fs/rock/RockSwapDir.h
+++ b/src/fs/rock/RockSwapDir.h
@@ -1,11 +1,11 @@
 #ifndef SQUID_FS_ROCK_SWAP_DIR_H
 #define SQUID_FS_ROCK_SWAP_DIR_H
 
-#include "SwapDir.h"
 #include "DiskIO/DiskFile.h"
 #include "DiskIO/IORequestor.h"
 #include "fs/rock/RockDbCell.h"
 #include "ipc/StoreMap.h"
+#include "SwapDir.h"
 
 class DiskIOStrategy;
 class ReadRequest;

diff --git a/src/fs/ufs/RebuildState.h b/src/fs/ufs/RebuildState.h
index 6a89e055d41fefb743533ff433ea40a24a21a165..9c20e01ecbfa293e73007f52d157e21a37ab1218 100644 (file)
--- a/src/fs/ufs/RebuildState.h
+++ b/src/fs/ufs/RebuildState.h
@@ -31,9 +31,9 @@
 #define SQUID_FS_UFS_REBUILDSTATE_H
 
 #include "base/RefCount.h"
+#include "store_rebuild.h"
 #include "UFSSwapDir.h"
 #include "UFSSwapLogParser.h"
-#include "store_rebuild.h"
 
 class StoreEntry;
 

diff --git a/src/fs/ufs/UFSStoreState.cc b/src/fs/ufs/UFSStoreState.cc
index a6c4708571f1117a983f487d08b3378e5c997335..5a5b9e2fe32b9a60d0886597cdaad17de96679b9 100644 (file)
--- a/src/fs/ufs/UFSStoreState.cc
+++ b/src/fs/ufs/UFSStoreState.cc
@@ -32,16 +32,16 @@
  */
 
 #include "squid.h"
-#include "Store.h"
-#include "Generic.h"
 #include "DiskIO/DiskFile.h"
 #include "DiskIO/DiskIOStrategy.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
+#include "Generic.h"
 #include "SquidList.h"
+#include "Store.h"
 #include "SwapDir.h"
-#include "UFSStrategy.h"
 #include "UFSStoreState.h"
+#include "UFSStrategy.h"
 
 CBDATA_NAMESPACED_CLASS_INIT(Fs::Ufs,UFSStoreState);
 

diff --git a/src/fs/ufs/UFSStrategy.cc b/src/fs/ufs/UFSStrategy.cc
index fd3517440ebaadf9784d595739f7a73acd7149cd..5df2477c0f02b0c0d214251f7472110d542ce16e 100644 (file)
--- a/src/fs/ufs/UFSStrategy.cc
+++ b/src/fs/ufs/UFSStrategy.cc
@@ -32,8 +32,8 @@
 #include "squid.h"
 
 #include "DiskIO/DiskIOStrategy.h"
-#include "UFSStrategy.h"
 #include "UFSStoreState.h"
+#include "UFSStrategy.h"
 #include "UFSSwapDir.h"
 
 bool

diff --git a/src/fs/ufs/UFSSwapDir.cc b/src/fs/ufs/UFSSwapDir.cc
index 9a1094d7dd9829ce8d73f32dfe9e0512927b93f2..39e114573fe01bc2ac0e575370f5555b5c3a6f04 100644 (file)
--- a/src/fs/ufs/UFSSwapDir.cc
+++ b/src/fs/ufs/UFSSwapDir.cc
@@ -33,22 +33,22 @@
 
 #include "squid.h"
 #include "cache_cf.h"
-#include "disk.h"
 #include "ConfigOption.h"
+#include "disk.h"
 #include "DiskIO/DiskIOModule.h"
-#include "FileMap.h"
+#include "DiskIO/DiskIOStrategy.h"
 #include "fde.h"
+#include "FileMap.h"
 #include "globals.h"
 #include "Parsing.h"
 #include "RebuildState.h"
+#include "SquidConfig.h"
 #include "SquidMath.h"
-#include "DiskIO/DiskIOStrategy.h"
+#include "SquidTime.h"
+#include "StatCounters.h"
 #include "store_key_md5.h"
 #include "StoreSearchUFS.h"
 #include "StoreSwapLogData.h"
-#include "SquidConfig.h"
-#include "SquidTime.h"
-#include "StatCounters.h"
 #include "tools.h"
 #include "UFSSwapDir.h"
 

diff --git a/src/fs/ufs/UFSSwapDir.h b/src/fs/ufs/UFSSwapDir.h
index 3132e37bc53d32c6e75d00452a1a16ef76d1827c..dc6776e5e76916964751e2612758a49ded8bafe4 100644 (file)
--- a/src/fs/ufs/UFSSwapDir.h
+++ b/src/fs/ufs/UFSSwapDir.h
@@ -33,8 +33,8 @@
 #include "Store.h"
 #include "StoreIOState.h"
 #include "StoreSearch.h"
-#include "SwapDir.h"
 #include "swap_log_op.h"
+#include "SwapDir.h"
 #include "UFSStrategy.h"
 
 class HttpRequest;

diff --git a/src/helper.h b/src/helper.h
index 34dfd8465e80f9a322ddcc26698c65f696cd5292..cc865e93d883496846b67589ac5258e10034128f 100644 (file)
--- a/src/helper.h
+++ b/src/helper.h
@@ -37,9 +37,9 @@
 #include "cbdata.h"
 #include "comm/forward.h"
 #include "dlink.h"
-#include "ip/Address.h"
 #include "HelperChildConfig.h"
 #include "HelperReply.h"
+#include "ip/Address.h"
 
 class helper_request;
 

diff --git a/src/htcp.cc b/src/htcp.cc
index 6f6f1fd7ce26632c393cf9d0eb0543c8c49dd307..4ad6678bac0a114ef3ef3175742ffe3429fb9aba 100644 (file)
--- a/src/htcp.cc
+++ b/src/htcp.cc
@@ -54,8 +54,8 @@
 #include "SquidConfig.h"
 #include "SquidTime.h"
 #include "StatCounters.h"
-#include "store_key_md5.h"
 #include "Store.h"
+#include "store_key_md5.h"
 #include "StoreClient.h"
 #include "tools.h"
 #include "URL.h"

diff --git a/src/http.cc b/src/http.cc
index 78070948637fc9372d7bb4ca71777f95554a4a64..9a8f6ddf16b2cf5ff4fd6d11e48b7ea7f4499163 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -36,9 +36,9 @@
 
 #include "squid.h"
 #include "acl/FilledChecklist.h"
-#include "base64.h"
 #include "base/AsyncJobCalls.h"
 #include "base/TextException.h"
+#include "base64.h"
 #include "CachePeer.h"
 #include "ChunkedCodingParser.h"
 #include "client_side.h"
@@ -49,8 +49,8 @@
 #include "fd.h"
 #include "fde.h"
 #include "globals.h"
-#include "HttpControlMsg.h"
 #include "http.h"
+#include "HttpControlMsg.h"
 #include "HttpHdrCc.h"
 #include "HttpHdrContRange.h"
 #include "HttpHdrSc.h"

diff --git a/src/icmp/Icmp.cc b/src/icmp/Icmp.cc
index 1346a286b513670703fbfec9322b7a9da5b6d490..422b99fdd0f211c3b092e27640f29be0621a3a8d 100644 (file)
--- a/src/icmp/Icmp.cc
+++ b/src/icmp/Icmp.cc
@@ -30,9 +30,9 @@
  *
  */
 #include "squid.h"
+#include "Debug.h"
 #include "Icmp.h"
 #include "SquidTime.h"
-#include "Debug.h"
 
 Icmp::Icmp()
 {

diff --git a/src/icmp/Icmp4.cc b/src/icmp/Icmp4.cc
index a983cca1ca5624c54de6c2d95ce42b1312a6d82b..3b79d2116f513b69f81b3858060ac287d34ec116 100644 (file)
--- a/src/icmp/Icmp4.cc
+++ b/src/icmp/Icmp4.cc
@@ -35,11 +35,11 @@
 
 #if USE_ICMP
 
-#include "leakcheck.h"
-#include "SquidTime.h"
+#include "Debug.h"
 #include "Icmp4.h"
 #include "IcmpPinger.h"
-#include "Debug.h"
+#include "leakcheck.h"
+#include "SquidTime.h"
 
 const char *icmpPktStr[] = {
     "Echo Reply",

diff --git a/src/icmp/Icmp6.cc b/src/icmp/Icmp6.cc
index 7b4bde6ec739fc0748af88f3cc3e45dc0040257f..6e8cab1eb25b0d0bd4003b296600384c4a689bd9 100644 (file)
--- a/src/icmp/Icmp6.cc
+++ b/src/icmp/Icmp6.cc
@@ -35,11 +35,11 @@
 
 #if USE_ICMP
 
-#include "leakcheck.h"
-#include "SquidTime.h"
 #include "Debug.h"
 #include "Icmp6.h"
 #include "IcmpPinger.h"
+#include "leakcheck.h"
+#include "SquidTime.h"
 
 // Some system headers are only neeed internally here.
 // They should not be included via the header.

diff --git a/src/icmp/IcmpPinger.cc b/src/icmp/IcmpPinger.cc
index e230fb332efd83d65e0f21ec8254498d059ff5d2..e49c69b8cdc62772566b815fd47662ef1d965a18 100644 (file)
--- a/src/icmp/IcmpPinger.cc
+++ b/src/icmp/IcmpPinger.cc
@@ -36,11 +36,11 @@
 
 #if USE_ICMP
 
-#include "SquidTime.h"
-#include "IcmpPinger.h"
+#include "Debug.h"
 #include "Icmp4.h"
 #include "Icmp6.h"
-#include "Debug.h"
+#include "IcmpPinger.h"
+#include "SquidTime.h"
 
 #if HAVE_ERRNO_H
 #include <errno.h>

diff --git a/src/icp_v3.cc b/src/icp_v3.cc
index 5bfe8680a1765088eab9173d73c16e258754af58..41f87ab6f08f3ed37139c908ee9d19762858c0db 100644 (file)
--- a/src/icp_v3.cc
+++ b/src/icp_v3.cc
@@ -36,9 +36,9 @@
  */
 
 #include "squid.h"
-#include "Store.h"
-#include "ICP.h"
 #include "HttpRequest.h"
+#include "ICP.h"
+#include "Store.h"
 
 /// \ingroup ServerProtocolICPInternal3
 class ICP3State : public ICPState, public StoreClient

diff --git a/src/ident/Ident.cc b/src/ident/Ident.cc
index 3f15b8700bf4a3d23e01fc519713dd04a1c78458..1f90afebec34ee18ac76af3aaba953f41ae55c58 100644 (file)
--- a/src/ident/Ident.cc
+++ b/src/ident/Ident.cc
@@ -35,8 +35,8 @@
 #include "comm.h"
 #include "comm/Connection.h"
 #include "comm/ConnOpener.h"
-#include "CommCalls.h"
 #include "comm/Write.h"
+#include "CommCalls.h"
 #include "globals.h"
 #include "ident/Config.h"
 #include "ident/Ident.h"

diff --git a/src/internal.cc b/src/internal.cc
index 15d388877dfc6a5a51ac08522f19c82416633fed..a9c51c2008555294e9bd8c64b8068ee6e44b5926 100644 (file)
--- a/src/internal.cc
+++ b/src/internal.cc
@@ -35,13 +35,13 @@
 #include "CacheManager.h"
 #include "comm/Connection.h"
 #include "errorpage.h"
-#include "icmp/net_db.h"
-#include "Store.h"
-#include "HttpRequest.h"
 #include "HttpReply.h"
+#include "HttpRequest.h"
+#include "icmp/net_db.h"
 #include "MemBuf.h"
 #include "SquidConfig.h"
 #include "SquidTime.h"
+#include "Store.h"
 #include "tools.h"
 #include "URL.h"
 #include "wordlist.h"

diff --git a/src/ip/Address.cc b/src/ip/Address.cc
index 693319f045607ff5383aa92e5f8f9a0076f35681..774e21431d5affec24af6afed5ea16fcd2e52afd 100644 (file)
--- a/src/ip/Address.cc
+++ b/src/ip/Address.cc
@@ -4,8 +4,8 @@
  * COPYRIGHT: GPL version 2, (C)2007-2013 Treehouse Networks Ltd.
  */
 #include "squid.h"
-#include "compat/inet_ntop.h"
 #include "compat/getaddrinfo.h"
+#include "compat/inet_ntop.h"
 #include "Debug.h"
 #include "ip/Address.h"
 #include "ip/tools.h"

diff --git a/src/ip/Intercept.cc b/src/ip/Intercept.cc
index 0bf0d7a569b891ce4c9b803019c88a623f31a7df..8e00276b642a4d5f0eb2ec39b5e330dcbd89e3e2 100644 (file)
--- a/src/ip/Intercept.cc
+++ b/src/ip/Intercept.cc
@@ -32,8 +32,8 @@
  */
 #include "squid.h"
 #include "comm/Connection.h"
-#include "ip/Intercept.h"
 #include "fde.h"
+#include "ip/Intercept.h"
 #include "src/tools.h"
 
 #if IPF_TRANSPARENT

diff --git a/src/ip/QosConfig.cc b/src/ip/QosConfig.cc
index b300a4c20dc634cc0834b05b85c9961f4d1e494c..c1a52675f30a21e0c9c43e0d5541bc8b331978b9 100644 (file)
--- a/src/ip/QosConfig.cc
+++ b/src/ip/QosConfig.cc
@@ -7,8 +7,8 @@
 #include "fde.h"
 #include "globals.h"
 #include "hier_code.h"
-#include "ip/tools.h"
 #include "ip/QosConfig.h"
+#include "ip/tools.h"
 #include "Parsing.h"
 
 #if HAVE_ERRNO_H

diff --git a/src/ip/testAddress.cc b/src/ip/testAddress.cc
index 4280b0b410afc863a06a9eb02c10be4bbc36f8ad..e8a69a0f27c73b4ea9a8228055b6c184289fa283 100644 (file)
--- a/src/ip/testAddress.cc
+++ b/src/ip/testAddress.cc
@@ -1,9 +1,9 @@
 #define SQUID_UNIT_TEST 1
 #include "squid.h"
 //#include "compat/getaddrinfo.h"
-#include "testAddress.h"
 #include "ip/Address.h"
 #include "ip/tools.h"
+#include "testAddress.h"
 
 #if HAVE_CSTRING
 #include <cstring>

diff --git a/src/ipc.cc b/src/ipc.cc
index 2f3f5c3c6b7a94081d9e7f9bd8b7dd7a890470d6..94e611ec8606d2c6a454bd6de872b78f17ad24fe 100644 (file)
--- a/src/ipc.cc
+++ b/src/ipc.cc
@@ -37,10 +37,10 @@
 #include "globals.h"
 #include "ip/Address.h"
 #include "ipc/Kid.h"
+#include "rfc1738.h"
 #include "SquidConfig.h"
 #include "SquidIpc.h"
 #include "tools.h"
-#include "rfc1738.h"
 
 static const char *hello_string = "hi there\n";
 #define HELLO_BUF_SZ 32

diff --git a/src/ipc/Inquirer.h b/src/ipc/Inquirer.h
index c51c5423c95c3a6fde2c6ebf307e6da4d48c653a..374334779332c614511f2ce5e8bf41e030e1fdc5 100644 (file)
--- a/src/ipc/Inquirer.h
+++ b/src/ipc/Inquirer.h
@@ -6,8 +6,8 @@
 #ifndef SQUID_IPC_INQUIRER_H
 #define SQUID_IPC_INQUIRER_H
 
-#include "base/AsyncJobCalls.h"
 #include "base/AsyncJob.h"
+#include "base/AsyncJobCalls.h"
 #include "ipc/forward.h"
 #include "ipc/Request.h"
 #include "ipc/Response.h"

diff --git a/src/ipc/Kids.cc b/src/ipc/Kids.cc
index a5dfddfba34b90a771db38b0c4523b6cdd155a38..17c1465144cde3c84cb657c7aaaf42c49c61a3a9 100644 (file)
--- a/src/ipc/Kids.cc
+++ b/src/ipc/Kids.cc
@@ -6,8 +6,8 @@
 #include "base/TextException.h"
 #include "globals.h"
 #include "ipc/Kids.h"
-#include "tools.h"
 #include "SquidConfig.h"
+#include "tools.h"
 
 Kids TheKids;
 KidName TheKidName;

diff --git a/src/ipc/Port.cc b/src/ipc/Port.cc
index 720625f742d75560d059b533c08db1fe7a2aa158..927252ce26308c163fcd8354a3efca751494047f 100644 (file)
--- a/src/ipc/Port.cc
+++ b/src/ipc/Port.cc
@@ -5,8 +5,8 @@
 
 #include "squid.h"
 #include "comm.h"
-#include "CommCalls.h"
 #include "comm/Connection.h"
+#include "CommCalls.h"
 #include "ipc/Port.h"
 
 const char Ipc::coordinatorAddr[] = DEFAULT_STATEDIR "/coordinator.ipc";

diff --git a/src/ipc/Port.h b/src/ipc/Port.h
index 9282f2385f30f218abb4d96cc4d9c36ce6f5e681..299a6c7ade7d438f7bfe2bea1e32bf4344c48418 100644 (file)
--- a/src/ipc/Port.h
+++ b/src/ipc/Port.h
@@ -6,8 +6,8 @@
 #ifndef SQUID_IPC_PORT_H
 #define SQUID_IPC_PORT_H
 
-#include "SquidString.h"
 #include "ipc/UdsOp.h"
+#include "SquidString.h"
 
 namespace Ipc
 {

diff --git a/src/ipc/Queue.h b/src/ipc/Queue.h
index 6c2fecd8b7f8e7134a21b60873f68d837bf9ddca..9618b47bee33960ddced7853bce66dc84ad2b662 100644 (file)
--- a/src/ipc/Queue.h
+++ b/src/ipc/Queue.h
@@ -4,9 +4,9 @@
 #ifndef SQUID_IPC_QUEUE_H
 #define SQUID_IPC_QUEUE_H
 
+#include "base/InstanceId.h"
 #include "base/Vector.h"
 #include "Debug.h"
-#include "base/InstanceId.h"
 #include "ipc/AtomicWord.h"
 #include "ipc/mem/FlexibleArray.h"
 #include "ipc/mem/Pointer.h"

diff --git a/src/ipc/ReadWriteLock.cc b/src/ipc/ReadWriteLock.cc
index 14ba1b45498b0d93c951d61ced8ed6d08444279b..855ab5bc998f4afc73775b9e1bf774743d54376c 100644 (file)
--- a/src/ipc/ReadWriteLock.cc
+++ b/src/ipc/ReadWriteLock.cc
@@ -3,8 +3,8 @@
  */
 
 #include "squid.h"
-#include "Store.h"
 #include "ipc/ReadWriteLock.h"
+#include "Store.h"
 
 bool
 Ipc::ReadWriteLock::lockShared()

diff --git a/src/ipc/SharedListen.cc b/src/ipc/SharedListen.cc
index 70a484805ab343a4fba0dc4fb8b50718bf8d5312..430617891ec0cd8eca9d01fc3917f5803274a26a 100644 (file)
--- a/src/ipc/SharedListen.cc
+++ b/src/ipc/SharedListen.cc
@@ -3,16 +3,16 @@
  */
 
 #include "squid.h"
-#include "comm.h"
 #include "base/TextException.h"
+#include "comm.h"
 #include "comm/Connection.h"
 #include "globals.h"
-#include "ipc/Port.h"
-#include "ipc/Messages.h"
 #include "ipc/Kids.h"
-#include "ipc/TypedMsgHdr.h"
-#include "ipc/StartListening.h"
+#include "ipc/Messages.h"
+#include "ipc/Port.h"
 #include "ipc/SharedListen.h"
+#include "ipc/StartListening.h"
+#include "ipc/TypedMsgHdr.h"
 #include "tools.h"
 
 #include <map>

diff --git a/src/ipc/StartListening.h b/src/ipc/StartListening.h
index 5d73fdfdf6e65c4fbc50f7fe810d6053f58c6581..44055c9948df224d28e5e9ff1df0c4464f811b02 100644 (file)
--- a/src/ipc/StartListening.h
+++ b/src/ipc/StartListening.h
@@ -6,11 +6,11 @@
 #ifndef SQUID_IPC_START_LISTENING_H
 #define SQUID_IPC_START_LISTENING_H
 
+#include "base/AsyncCall.h"
 #include "base/Subscription.h"
 #include "comm/forward.h"
 #include "ip/forward.h"
 #include "ipc/FdNotes.h"
-#include "base/AsyncCall.h"
 
 #if HAVE_IOSFWD
 #include <iosfwd>

diff --git a/src/ipc/StoreMap.cc b/src/ipc/StoreMap.cc
index bb365513fd974de0d3d0d0a7c305d88779f98ad8..41fdf6f0f96dac759ab1114c47dff2e86282ad2a 100644 (file)
--- a/src/ipc/StoreMap.cc
+++ b/src/ipc/StoreMap.cc
@@ -4,8 +4,8 @@
 
 #include "squid.h"
 #include "ipc/StoreMap.h"
-#include "store_key_md5.h"
 #include "Store.h"
+#include "store_key_md5.h"
 #include "tools.h"
 
 Ipc::StoreMap::Owner *

diff --git a/src/ipc/StoreMap.h b/src/ipc/StoreMap.h
index fcb7f9d1a3ae0f18f86721d1855e946adfea7345..54979730168a6449cf021ce8aaaab0001633ff48 100644 (file)
--- a/src/ipc/StoreMap.h
+++ b/src/ipc/StoreMap.h
@@ -1,9 +1,9 @@
 #ifndef SQUID_IPC_STORE_MAP_H
 #define SQUID_IPC_STORE_MAP_H
 
-#include "ipc/ReadWriteLock.h"
 #include "ipc/mem/FlexibleArray.h"
 #include "ipc/mem/Pointer.h"
+#include "ipc/ReadWriteLock.h"
 #include "typedefs.h"
 
 namespace Ipc

diff --git a/src/ipc/Strand.cc b/src/ipc/Strand.cc
index 363e706e0c0d74fb37a2648e84a8006deb5cddb3..f6939b4b5ed418efb73c8c9b3dc0a2f67e9fdd75 100644 (file)
--- a/src/ipc/Strand.cc
+++ b/src/ipc/Strand.cc
@@ -6,19 +6,19 @@
 #include "squid.h"
 #include "base/Subscription.h"
 #include "base/TextException.h"
+#include "CacheManager.h"
 #include "comm/Connection.h"
 #include "globals.h"
-#include "ipc/Strand.h"
-#include "ipc/StrandCoord.h"
+#include "ipc/Kids.h"
 #include "ipc/Messages.h"
 #include "ipc/SharedListen.h"
+#include "ipc/Strand.h"
+#include "ipc/StrandCoord.h"
 #include "ipc/StrandSearch.h"
-#include "ipc/Kids.h"
+#include "mgr/Forwarder.h"
 #include "mgr/Request.h"
 #include "mgr/Response.h"
-#include "mgr/Forwarder.h"
 #include "SwapDir.h" /* XXX: scope boundary violation */
-#include "CacheManager.h"
 #if USE_DISKIO_IPCIO
 #include "DiskIO/IpcIo/IpcIoFile.h" /* XXX: scope boundary violation */
 #endif

diff --git a/src/ipc/UdsOp.cc b/src/ipc/UdsOp.cc
index 23991c2828d51f858e1519d330d65599e9f1dd8a..5f49ace3755a29ed7086661e5a052814dae58f5d 100644 (file)
--- a/src/ipc/UdsOp.cc
+++ b/src/ipc/UdsOp.cc
@@ -4,11 +4,11 @@
  */
 
 #include "squid.h"
+#include "base/TextException.h"
 #include "comm.h"
-#include "CommCalls.h"
 #include "comm/Connection.h"
 #include "comm/Write.h"
-#include "base/TextException.h"
+#include "CommCalls.h"
 #include "ipc/UdsOp.h"
 
 Ipc::UdsOp::UdsOp(const String& pathAddr):

diff --git a/src/ipc/UdsOp.h b/src/ipc/UdsOp.h
index 9c3b1eed136e07044e2c79b70fc2b8cafb811e38..e7278305fa04a6e225773b335d4c0476506338bb 100644 (file)
--- a/src/ipc/UdsOp.h
+++ b/src/ipc/UdsOp.h
@@ -6,12 +6,12 @@
 #ifndef SQUID_IPC_ASYNCUDSOP_H
 #define SQUID_IPC_ASYNCUDSOP_H
 
-#include "SquidString.h"
 #include "base/AsyncJob.h"
 #include "cbdata.h"
 #include "comm/forward.h"
-#include "ipc/TypedMsgHdr.h"
 #include "ipc/FdNotes.h"
+#include "ipc/TypedMsgHdr.h"
+#include "SquidString.h"
 
 class CommTimeoutCbParams;
 class CommIoCbParams;

diff --git a/src/ipc/mem/Pages.cc b/src/ipc/mem/Pages.cc
index 779db4fe96b86bfc3cb70bf5923d0b0338a19c4f..51d65dd10cafa7bfa52447a387291c720e485570 100644 (file)
--- a/src/ipc/mem/Pages.cc
+++ b/src/ipc/mem/Pages.cc
@@ -4,8 +4,8 @@
  */
 
 #include "squid.h"
-#include "base/TextException.h"
 #include "base/RunnersRegistry.h"
+#include "base/TextException.h"
 #include "ipc/mem/PagePool.h"
 #include "ipc/mem/Pages.h"
 #include "SwapDir.h"

diff --git a/src/ipcache.cc b/src/ipcache.cc
index eab7767121beb64372d5cb88c967ebcda69a3965..0e808593906520520da5428ad213bedd1c13596c 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -31,8 +31,8 @@
  */
 
 #include "squid.h"
-#include "cbdata.h"
 #include "CacheManager.h"
+#include "cbdata.h"
 #include "dlink.h"
 #include "DnsLookupDetails.h"
 #include "event.h"

diff --git a/src/log/FormatHttpdCombined.cc b/src/log/FormatHttpdCombined.cc
index ada83c521e38fe056e57154382ecd37d21fe4519..b63dc62132b7e15a8a82779e750627837a965230 100644 (file)
--- a/src/log/FormatHttpdCombined.cc
+++ b/src/log/FormatHttpdCombined.cc
@@ -32,8 +32,8 @@
 
 #include "squid.h"
 #include "AccessLogEntry.h"
-#include "format/Token.h"
 #include "format/Quoting.h"
+#include "format/Token.h"
 #include "globals.h"
 #include "HttpRequest.h"
 #include "log/File.h"

diff --git a/src/log/ModDaemon.cc b/src/log/ModDaemon.cc
index e23fccf2c59b122affa5706f98b63a76e00d0ddb..e03b677333cedbed3307a1d0badc82d036041ec5 100644 (file)
--- a/src/log/ModDaemon.cc
+++ b/src/log/ModDaemon.cc
@@ -38,8 +38,8 @@
 #include "log/Config.h"
 #include "log/File.h"
 #include "log/ModDaemon.h"
-#include "SquidIpc.h"
 #include "SquidConfig.h"
+#include "SquidIpc.h"
 #include "SquidTime.h"
 
 #if HAVE_ERRNO_H

diff --git a/src/log/TcpLogger.cc b/src/log/TcpLogger.cc
index 647f6233228ae59cbe05031d76389b0bc63369c0..52593f3ed45634ca9fdd29509157d2cb2d89987d 100644 (file)
--- a/src/log/TcpLogger.cc
+++ b/src/log/TcpLogger.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
 #include "comm.h"
-#include "comm/ConnOpener.h"
 #include "comm/Connection.h"
+#include "comm/ConnOpener.h"
 #include "comm/Loops.h"
 #include "comm/Write.h"
 #include "fde.h"

diff --git a/src/log/access_log.cc b/src/log/access_log.cc
index cb5af0eed96da7148a95eac7efb2ee72c36f44f9..b161d7bd8edef08d830551508efead154e479713 100644 (file)
--- a/src/log/access_log.cc
+++ b/src/log/access_log.cc
@@ -37,10 +37,10 @@
 #include "adaptation/Config.h"
 #endif
 #include "CachePeer.h"
-#include "errorpage.h"
 #include "err_detail_type.h"
 #include "errorpage.h"
 #include "errorpage.h"
+#include "errorpage.h"
 #include "format/Token.h"
 #include "globals.h"
 #include "hier_code.h"

diff --git a/src/main.cc b/src/main.cc
index fc18b003dc5356e15728fe1dc0e3ecd83e816c50..c5116e24fa2deb6dfa9868f1b348b80afcba5c34 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -53,8 +53,8 @@
 #include "ExternalACL.h"
 #include "fd.h"
 #include "format/Token.h"
-#include "fs/Module.h"
 #include "fqdncache.h"
+#include "fs/Module.h"
 #include "FwdState.h"
 #include "globals.h"
 #include "htcp.h"
@@ -64,33 +64,33 @@
 #include "icmp/net_db.h"
 #include "ICP.h"
 #include "ident/Ident.h"
-#include "ipcache.h"
+#include "ip/tools.h"
 #include "ipc/Coordinator.h"
 #include "ipc/Kids.h"
 #include "ipc/Strand.h"
-#include "ip/tools.h"
+#include "ipcache.h"
 #include "Mem.h"
 #include "MemPool.h"
 #include "mime.h"
 #include "neighbors.h"
 #include "pconn.h"
-#include "PeerSelectState.h"
 #include "peer_sourcehash.h"
 #include "peer_userhash.h"
+#include "PeerSelectState.h"
 #include "profiler/Profiler.h"
 #include "redirect.h"
 #include "refresh.h"
 #include "send-announce.h"
-#include "store_log.h"
-#include "tools.h"
 #include "SquidConfig.h"
 #include "SquidDns.h"
 #include "SquidTime.h"
 #include "stat.h"
 #include "StatCounters.h"
-#include "StoreFileSystem.h"
 #include "Store.h"
+#include "store_log.h"
+#include "StoreFileSystem.h"
 #include "SwapDir.h"
+#include "tools.h"
 #include "unlinkd.h"
 #include "URL.h"
 #include "wccp.h"
@@ -123,8 +123,8 @@
 #include "ssl/certificate_db.h"
 #endif
 #if USE_SSL
-#include "ssl/helper.h"
 #include "ssl/context_storage.h"
+#include "ssl/helper.h"
 #endif
 #if ICAP_CLIENT
 #include "adaptation/icap/Config.h"

diff --git a/src/mem.cc b/src/mem.cc
index 3f5fe0d0e497e255b015041fa7c5454ceddf7c3a..16e6e457beb817f5f0f496e30d7fac7444a9f4df 100644 (file)
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -38,12 +38,12 @@
 #include "disk.h"
 #include "dlink.h"
 #include "event.h"
+#include "icmp/net_db.h"
 #include "md5.h"
 #include "Mem.h"
 #include "MemBuf.h"
 #include "memMeter.h"
 #include "mgr/Registration.h"
-#include "icmp/net_db.h"
 #include "RegexList.h"
 #include "SquidConfig.h"
 #include "SquidList.h"

diff --git a/src/mem_node.h b/src/mem_node.h
index 214028caeeb68ec89158142be6d37bd3fb0d7f55..d0392fa47207ed7d483a662fb4e97e2c6c4f8075 100644 (file)
--- a/src/mem_node.h
+++ b/src/mem_node.h
@@ -34,8 +34,8 @@
 
 #include "defines.h"
 #include "MemPool.h"
-#include "StoreIOBuffer.h"
 #include "Range.h"
+#include "StoreIOBuffer.h"
 
 class mem_node
 {

diff --git a/src/mgr/Action.cc b/src/mgr/Action.cc
index dcb2dc88cfad05285c76307c7a20bfe1f0ae79ad..4e1d2e643700b8f88d72fc5e049a14dec238257e 100644 (file)
--- a/src/mgr/Action.cc
+++ b/src/mgr/Action.cc
@@ -7,8 +7,8 @@
 #include "comm/Connection.h"
 #include "HttpReply.h"
 #include "ipc/Port.h"
-#include "mgr/ActionCreator.h"
 #include "mgr/Action.h"
+#include "mgr/ActionCreator.h"
 #include "mgr/ActionParams.h"
 #include "mgr/ActionProfile.h"
 #include "mgr/Command.h"

diff --git a/src/mgr/BasicActions.cc b/src/mgr/BasicActions.cc
index 8f96df20cabb21f3a5b991b371bb226793a49379..19100d4a8f6375d354a01f33eb011acc2e8c3f18 100644 (file)
--- a/src/mgr/BasicActions.cc
+++ b/src/mgr/BasicActions.cc
@@ -11,8 +11,8 @@
 #include "mgr/BasicActions.h"
 #include "mgr/Registration.h"
 #include "protos.h"
-#include "Store.h"
 #include "SquidConfig.h"
+#include "Store.h"
 
 Mgr::IndexAction::Pointer
 Mgr::IndexAction::Create(const Command::Pointer &cmd)

diff --git a/src/mgr/Forwarder.cc b/src/mgr/Forwarder.cc
index d7a754dcfd52753cac3e4351fc18850a6bd99537..eb139e02093bad07245293b558c9e2801d90daef 100644 (file)
--- a/src/mgr/Forwarder.cc
+++ b/src/mgr/Forwarder.cc
@@ -6,8 +6,8 @@
 #include "squid.h"
 #include "base/AsyncJobCalls.h"
 #include "base/TextException.h"
-#include "CommCalls.h"
 #include "comm/Connection.h"
+#include "CommCalls.h"
 #include "errorpage.h"
 #include "globals.h"
 #include "HttpReply.h"

diff --git a/src/mgr/InfoAction.cc b/src/mgr/InfoAction.cc
index dc9e6c1df184d4fea6d1e7008f596ba9feb26bca..174dabf78d1bf11c4aa1096c1b45bdcec21d4d4b 100644 (file)
--- a/src/mgr/InfoAction.cc
+++ b/src/mgr/InfoAction.cc
@@ -9,8 +9,8 @@
 #include "globals.h"
 #include "HttpReply.h"
 #include "ipc/Messages.h"
-#include "ipc/UdsOp.h"
 #include "ipc/TypedMsgHdr.h"
+#include "ipc/UdsOp.h"
 #include "mgr/Filler.h"
 #include "mgr/InfoAction.h"
 #include "mgr/Request.h"

diff --git a/src/mgr/Inquirer.cc b/src/mgr/Inquirer.cc
index 8475857ec09491072ffbd7f33bb150f80f8f0cb3..9eb412dea68a646828d329b3ef1381c825f9d528 100644 (file)
--- a/src/mgr/Inquirer.cc
+++ b/src/mgr/Inquirer.cc
@@ -9,17 +9,17 @@
 #include "comm/Connection.h"
 #include "comm/Write.h"
 #include "CommCalls.h"
+#include "errorpage.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"
 #include "ipc/UdsOp.h"
 #include "mgr/ActionWriter.h"
-#include "mgr/IntParam.h"
-#include "mgr/Inquirer.h"
 #include "mgr/Command.h"
+#include "mgr/Inquirer.h"
+#include "mgr/IntParam.h"
 #include "mgr/Request.h"
 #include "mgr/Response.h"
 #include "SquidTime.h"
-#include "errorpage.h"
 #include <memory>
 #include <algorithm>
 

diff --git a/src/mgr/IoAction.h b/src/mgr/IoAction.h
index 6487247c1fbc59aa6a785abaea8a9014716c41d4..479fe77c50d5cdef20b9f1518297ebf09cf161bd 100644 (file)
--- a/src/mgr/IoAction.h
+++ b/src/mgr/IoAction.h
@@ -6,8 +6,8 @@
 #ifndef SQUID_MGR_IO_ACTION_H
 #define SQUID_MGR_IO_ACTION_H
 
-#include "mgr/Action.h"
 #include "IoStats.h"
+#include "mgr/Action.h"
 
 namespace Mgr
 {

diff --git a/src/mgr/QueryParams.cc b/src/mgr/QueryParams.cc
index ef5438a17f6f8b03d4bc05f697e791fe15f84b40..e43e709a2d43b73b70dc67bfcede5d70b25a412a 100644 (file)
--- a/src/mgr/QueryParams.cc
+++ b/src/mgr/QueryParams.cc
@@ -7,8 +7,8 @@
 #include "base/TextException.h"
 #include "ipc/TypedMsgHdr.h"
 #include "mgr/IntParam.h"
-#include "mgr/StringParam.h"
 #include "mgr/QueryParams.h"
+#include "mgr/StringParam.h"
 
 Mgr::QueryParam::Pointer
 Mgr::QueryParams::get(const String& name) const

diff --git a/src/mgr/StoreToCommWriter.cc b/src/mgr/StoreToCommWriter.cc
index ec16e9d0524e52c01025d236f03a649c9e024298..43a31562045cbb21f61f987c1a79ee413dd988a1 100644 (file)
--- a/src/mgr/StoreToCommWriter.cc
+++ b/src/mgr/StoreToCommWriter.cc
@@ -6,12 +6,12 @@
 #include "squid.h"
 #include "base/TextException.h"
 #include "comm/Connection.h"
-#include "CommCalls.h"
 #include "comm/Write.h"
+#include "CommCalls.h"
 #include "ipc/FdNotes.h"
 #include "mgr/StoreToCommWriter.h"
-#include "StoreClient.h"
 #include "Store.h"
+#include "StoreClient.h"
 
 CBDATA_NAMESPACED_CLASS_INIT(Mgr, StoreToCommWriter);
 

diff --git a/src/neighbors.cc b/src/neighbors.cc
index 267d2191269fa0a4f56115ad208cd1fd762ac5a0..81850d53e18f4854528b06a632d7636f611fb29c 100644 (file)
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -52,8 +52,8 @@
 #include "MemObject.h"
 #include "mgr/Registration.h"
 #include "multicast.h"
-#include "NeighborTypeDomainList.h"
 #include "neighbors.h"
+#include "NeighborTypeDomainList.h"
 #include "PeerDigest.h"
 #include "PeerSelectState.h"
 #include "RequestFlags.h"

diff --git a/src/peer_digest.cc b/src/peer_digest.cc
index 0d303a99d493c74d2a10affa71f24c5250887ff8..6abe52e2c803e680ef1f26f6ffb5212a0c30fc64 100644 (file)
--- a/src/peer_digest.cc
+++ b/src/peer_digest.cc
@@ -42,8 +42,8 @@
 #include "HttpRequest.h"
 #include "internal.h"
 #include "MemObject.h"
-#include "neighbors.h"
 #include "mime_header.h"
+#include "neighbors.h"
 #include "PeerDigest.h"
 #include "SquidTime.h"
 #include "Store.h"

diff --git a/src/peer_select.cc b/src/peer_select.cc
index 7746de51e3199ca697d55e15752d3eb6ffe3610f..9c92594e43a70b077650ec3571376fee77d4837f 100644 (file)
--- a/src/peer_select.cc
+++ b/src/peer_select.cc
@@ -45,8 +45,8 @@
 #include "HttpRequest.h"
 #include "icmp/net_db.h"
 #include "ICP.h"
-#include "ipcache.h"
 #include "ip/tools.h"
+#include "ipcache.h"
 #include "Mem.h"
 #include "neighbors.h"
 #include "peer_sourcehash.h"

diff --git a/src/refresh.cc b/src/refresh.cc
index cf5d9fd9666d3ed55306e80293b04baa91894cc9..4a4f08e921c7bf31642badfd308c985497d8b2d7 100644 (file)
--- a/src/refresh.cc
+++ b/src/refresh.cc
@@ -36,14 +36,14 @@
 #endif
 
 #include "squid.h"
-#include "mgr/Registration.h"
 #include "HttpHdrCc.h"
-#include "HttpRequest.h"
 #include "HttpReply.h"
+#include "HttpRequest.h"
 #include "MemObject.h"
+#include "mgr/Registration.h"
 #include "RefreshPattern.h"
-#include "SquidTime.h"
 #include "SquidConfig.h"
+#include "SquidTime.h"
 #include "Store.h"
 #include "URL.h"
 

diff --git a/src/repl/heap/store_heap_replacement.cc b/src/repl/heap/store_heap_replacement.cc
index 5eb9265ddfbf6fda5f1b6ca532f73696904fd338..168687a0f0750f91d39acbcac78800ffe99c1c3e 100644 (file)
--- a/src/repl/heap/store_heap_replacement.cc
+++ b/src/repl/heap/store_heap_replacement.cc
@@ -41,10 +41,10 @@
 
 #include "squid.h"
 #include "heap.h"
-#include "store_heap_replacement.h"
-#include "Store.h"
 #include "MemObject.h"
 #include "SquidTime.h"
+#include "Store.h"
+#include "store_heap_replacement.h"
 
 #if HAVE_MATH_H
 #include <math.h>

diff --git a/src/repl/heap/store_repl_heap.cc b/src/repl/heap/store_repl_heap.cc
index 66dabaf72aff86622502d0173f431182f0e3518b..0ac8c0714b92cc9115e10e6ed10f8fae8d59d9a3 100644 (file)
--- a/src/repl/heap/store_repl_heap.cc
+++ b/src/repl/heap/store_repl_heap.cc
@@ -41,10 +41,10 @@
 
 #include "squid.h"
 #include "heap.h"
-#include "store_heap_replacement.h"
+#include "MemObject.h"
 #include "SquidList.h"
 #include "Store.h"
-#include "MemObject.h"
+#include "store_heap_replacement.h"
 #include "wordlist.h"
 
 REMOVALPOLICYCREATE createRemovalPolicy_heap;

diff --git a/src/repl/lru/store_repl_lru.cc b/src/repl/lru/store_repl_lru.cc
index 97b8acb512eccabaec5946f852bf5953e39922bd..86e2c39fd244d1bfa40dca852fb059728f38a252 100644 (file)
--- a/src/repl/lru/store_repl_lru.cc
+++ b/src/repl/lru/store_repl_lru.cc
@@ -32,9 +32,9 @@
  */
 
 #include "squid.h"
-#include "Store.h"
 #include "MemObject.h"
 #include "SquidTime.h"
+#include "Store.h"
 
 REMOVALPOLICYCREATE createRemovalPolicy_lru;
 

diff --git a/src/snmp/Forwarder.cc b/src/snmp/Forwarder.cc
index 96811088fc74bbeafb38c3dfc8fb0cf52a2c60b8..3ec663fcf2ad7286476f7f4af00c2b117c7fe5db 100644 (file)
--- a/src/snmp/Forwarder.cc
+++ b/src/snmp/Forwarder.cc
@@ -5,14 +5,14 @@
 
 #include "squid.h"
 #include "base/TextException.h"
-#include "CommCalls.h"
 #include "comm.h"
+#include "CommCalls.h"
 #include "globals.h"
 #include "ipc/Port.h"
-#include "snmp_core.h"
 #include "snmp/Forwarder.h"
 #include "snmp/Request.h"
 #include "snmp/Response.h"
+#include "snmp_core.h"
 
 CBDATA_NAMESPACED_CLASS_INIT(Snmp, Forwarder);
 

diff --git a/src/snmp/Inquirer.cc b/src/snmp/Inquirer.cc
index 7b9b882455f2f005ce91d71d1a44ca39aa77a8af..aabf2e465daf08dc7b05f1ef06909deade08e5e2 100644 (file)
--- a/src/snmp/Inquirer.cc
+++ b/src/snmp/Inquirer.cc
@@ -5,14 +5,14 @@
 
 #include "squid.h"
 #include "base/TextException.h"
-#include "CommCalls.h"
 #include "comm.h"
 #include "comm/Connection.h"
+#include "CommCalls.h"
 #include "ipc/UdsOp.h"
-#include "snmp_core.h"
 #include "snmp/Inquirer.h"
-#include "snmp/Response.h"
 #include "snmp/Request.h"
+#include "snmp/Response.h"
+#include "snmp_core.h"
 
 CBDATA_NAMESPACED_CLASS_INIT(Snmp, Inquirer);
 

diff --git a/src/snmp/Pdu.cc b/src/snmp/Pdu.cc
index bf8ab94d92cb5f1cb727f4625b77162d6cdefce0..2c08fe45f432f185c0a743444e0b5fd68f5e02f4 100644 (file)
--- a/src/snmp/Pdu.cc
+++ b/src/snmp/Pdu.cc
@@ -6,9 +6,9 @@
 #include "squid.h"
 #include "base/TextException.h"
 #include "ipc/TypedMsgHdr.h"
-#include "snmp_core.h"
 #include "snmp/Pdu.h"
 #include "snmp/Var.h"
+#include "snmp_core.h"
 #include "tools.h"
 #if HAVE_ALGORITHM
 #include <algorithm>

diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc
index 5503c11f0f7ea80d9eb27d8f19cfed25db0a90c8..fb359e90e9b5e42f6b9dba6415f7dcffc6876763 100644 (file)
--- a/src/snmp_agent.cc
+++ b/src/snmp_agent.cc
@@ -31,19 +31,19 @@
  */
 
 #include "squid.h"
-#include "CachePeer.h"
 #include "cache_snmp.h"
+#include "CachePeer.h"
 #include "globals.h"
 #include "mem_node.h"
 #include "neighbors.h"
 #include "snmp_agent.h"
 #include "snmp_core.h"
-#include "StatCounters.h"
-#include "StatHist.h"
 #include "SquidConfig.h"
 #include "SquidMath.h"
 #include "SquidTime.h"
 #include "stat.h"
+#include "StatCounters.h"
+#include "StatHist.h"
 #include "Store.h"
 #include "tools.h"
 

diff --git a/src/snmp_core.cc b/src/snmp_core.cc
index 6bec56143dbcf87a1352388a96cdf4a2a484db98..c667bdb274666a0b00f7eadda9fa8a431158a3c7 100644 (file)
--- a/src/snmp_core.cc
+++ b/src/snmp_core.cc
@@ -40,9 +40,9 @@
 #include "comm/UdpOpenDialer.h"
 #include "ip/Address.h"
 #include "ip/tools.h"
+#include "snmp/Forwarder.h"
 #include "snmp_agent.h"
 #include "snmp_core.h"
-#include "snmp/Forwarder.h"
 #include "SnmpRequest.h"
 #include "SquidConfig.h"
 #include "tools.h"
@@ -1152,8 +1152,8 @@ oid2addr(oid * id, Ip::Address &addr, u_int size)
 }
 
 /* SNMP checklists */
-#include "acl/Strategy.h"
 #include "acl/Strategised.h"
+#include "acl/Strategy.h"
 #include "acl/StringData.h"
 
 class ACLSNMPCommunityStrategy : public ACLStrategy<char const *>

diff --git a/src/ssl/ErrorDetailManager.cc b/src/ssl/ErrorDetailManager.cc
index 4f0624186d68ba20d098461491047dab7de98383..5c03138beee7193230608a68547e0e9d9b0d8136 100644 (file)
--- a/src/ssl/ErrorDetailManager.cc
+++ b/src/ssl/ErrorDetailManager.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
 #include "ErrorDetail.h"
-#include "errorpage.h"
 #include "ErrorDetailManager.h"
+#include "errorpage.h"
 #include "mime_header.h"
 
 void Ssl::errorDetailInitialize()

diff --git a/src/ssl/ErrorDetailManager.h b/src/ssl/ErrorDetailManager.h
index 265bd2d0ce1779e523145fce91d139167f211e26..20a18a2cafcd53cb7e497c3f9925cce081d90d42 100644 (file)
--- a/src/ssl/ErrorDetailManager.h
+++ b/src/ssl/ErrorDetailManager.h
@@ -3,8 +3,8 @@
 
 #include "base/RefCount.h"
 #include "HttpRequest.h"
-#include "ssl/support.h"
 #include "SquidString.h"
+#include "ssl/support.h"
 
 #if HAVE_MAP
 #include <map>

diff --git a/src/ssl/cert_validate_message.cc b/src/ssl/cert_validate_message.cc
index 18ede8297da5de81791aa4e841af4593f80c181b..1cd5ad267c2214eb9bc7bf677ce4702afb29f800 100644 (file)
--- a/src/ssl/cert_validate_message.cc
+++ b/src/ssl/cert_validate_message.cc
@@ -2,9 +2,9 @@
 #include "acl/FilledChecklist.h"
 #include "globals.h"
 #include "helper.h"
-#include "ssl/support.h"
 #include "ssl/cert_validate_message.h"
 #include "ssl/ErrorDetail.h"
+#include "ssl/support.h"
 
 void
 Ssl::CertValidationMsg::composeRequest(CertValidationRequest const &vcert)

diff --git a/src/ssl/cert_validate_message.h b/src/ssl/cert_validate_message.h
index 9f92aa991d34d90bee435c3a2dc36502b6f2812b..d3d2221c5628355c0606c752a03c4c225bf68f86 100644 (file)
--- a/src/ssl/cert_validate_message.h
+++ b/src/ssl/cert_validate_message.h
@@ -5,8 +5,8 @@
 #define SQUID_SSL_CERT_VALIDATE_MESSAGE_H
 
 #include "HelperReply.h"
-#include "ssl/support.h"
 #include "ssl/crtd_message.h"
+#include "ssl/support.h"
 #include <vector>
 
 namespace Ssl

diff --git a/src/ssl/context_storage.cc b/src/ssl/context_storage.cc
index c1746849077d444a4209a3313d99e413cdb3a01f..2753d590c0274f3dfd0adc8953e82c7bb64995fb 100644 (file)
--- a/src/ssl/context_storage.cc
+++ b/src/ssl/context_storage.cc
@@ -1,8 +1,8 @@
 #include "squid.h"
+#include "mgr/Registration.h"
+#include "ssl/context_storage.h"
 #include "Store.h"
 #include "StoreEntryStream.h"
-#include "ssl/context_storage.h"
-#include "mgr/Registration.h"
 #if HAVE_LIMITS
 #include <limits>
 #endif

diff --git a/src/ssl/context_storage.h b/src/ssl/context_storage.h
index 59dd08c7d58e242417c2026798707e2599b2d491..20a6436234b56066847744453266917b5fc0ffc9 100644 (file)
--- a/src/ssl/context_storage.h
+++ b/src/ssl/context_storage.h
@@ -4,11 +4,11 @@
 #if USE_SSL
 
 #include "base/LruMap.h"
-#include "SquidTime.h"
 #include "CacheManager.h"
 #include "ip/Address.h"
 #include "mgr/Action.h"
 #include "mgr/Command.h"
+#include "SquidTime.h"
 #include "ssl/gadgets.h"
 #if HAVE_MAP
 #include <map>

diff --git a/src/ssl/crtd_message.cc b/src/ssl/crtd_message.cc
index 575953037399d2f31d8df5ce402d3542bf5ae559..f52db909daafdcc280f337ac288d46a7a3b885ea 100644 (file)
--- a/src/ssl/crtd_message.cc
+++ b/src/ssl/crtd_message.cc
@@ -1,6 +1,6 @@
 #include "squid.h"
-#include "ssl/gadgets.h"
 #include "ssl/crtd_message.h"
+#include "ssl/gadgets.h"
 #if HAVE_CSTDLIB
 #include <cstdlib>
 #endif

diff --git a/src/ssl/helper.cc b/src/ssl/helper.cc
index 789a4e31d934e75ab76d26897a71a63f20e26223..3e3099c3607d0c218d64c329d9b2214c7148aea3 100644 (file)
--- a/src/ssl/helper.cc
+++ b/src/ssl/helper.cc
@@ -1,13 +1,13 @@
 #include "squid.h"
 #include "anyp/PortCfg.h"
-#include "ssl/Config.h"
-#include "ssl/helper.h"
+#include "SquidConfig.h"
 #include "SquidString.h"
 #include "SquidTime.h"
-#include "SwapDir.h"
 #include "ssl/cert_validate_message.h"
+#include "ssl/Config.h"
+#include "ssl/helper.h"
+#include "SwapDir.h"
 #include "wordlist.h"
-#include "SquidConfig.h"
 
 LruMap<Ssl::CertValidationResponse> *Ssl::CertValidationHelper::HelperCache = NULL;
 

diff --git a/src/ssl/helper.h b/src/ssl/helper.h
index 0044191a02126c9a5ade114473ffc5f642f3c161..93cda09f5cb6b7fb4513d21c35a0aba088e3ad1a 100644 (file)
--- a/src/ssl/helper.h
+++ b/src/ssl/helper.h
@@ -1,8 +1,8 @@
 #ifndef SQUID_SSL_HELPER_H
 #define SQUID_SSL_HELPER_H
 
-#include "base/LruMap.h"
 #include "../helper.h"
+#include "base/LruMap.h"
 #include "ssl/cert_validate_message.h"
 #include "ssl/crtd_message.h"
 

diff --git a/src/ssl/ssl_crtd.cc b/src/ssl/ssl_crtd.cc
index 3b139ebb06983f54d4eacfebf879159082a5e0db..982faf1575796c1a23f223fa2b70dc31fd4b990e 100644 (file)
--- a/src/ssl/ssl_crtd.cc
+++ b/src/ssl/ssl_crtd.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
 #include "helpers/defines.h"
-#include "ssl/crtd_message.h"
 #include "ssl/certificate_db.h"
+#include "ssl/crtd_message.h"
 
 #if HAVE_CSTRING
 #include <cstring>

diff --git a/src/ssl/support.cc b/src/ssl/support.cc
index e0123f6f667b4270385e307664285436ecc2330e..5236ec559276656068389271cc831d65c368c407 100644 (file)
--- a/src/ssl/support.cc
+++ b/src/ssl/support.cc
@@ -45,8 +45,8 @@
 #include "SquidConfig.h"
 #include "ssl/Config.h"
 #include "ssl/ErrorDetail.h"
-#include "ssl/support.h"
 #include "ssl/gadgets.h"
+#include "ssl/support.h"
 #include "URL.h"
 
 #if HAVE_ERRNO_H

diff --git a/src/stat.cc b/src/stat.cc
index 59db7e56a2b78a66b331cc8639db6d79b231e75d..38c8a4f33cf204c6e52affa4baf2ea5c1f53cd62 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -33,8 +33,8 @@
 #include "squid.h"
 #include "CacheDigest.h"
 #include "CachePeer.h"
-#include "client_side_request.h"
 #include "client_side.h"
+#include "client_side_request.h"
 #include "comm/Connection.h"
 #include "comm/Loops.h"
 #include "event.h"
@@ -43,9 +43,9 @@
 #include "globals.h"
 #include "HttpRequest.h"
 #include "IoStats.h"
-#include "MemObject.h"
 #include "mem_node.h"
 #include "MemBuf.h"
+#include "MemObject.h"
 #include "mgr/CountersAction.h"
 #include "mgr/FunAction.h"
 #include "mgr/InfoAction.h"
@@ -58,11 +58,11 @@
 #include "SquidConfig.h"
 #include "SquidMath.h"
 #include "SquidTime.h"
-#include "StatCounters.h"
 #include "stat.h"
-#include "StoreClient.h"
+#include "StatCounters.h"
 #include "Store.h"
 #include "store_digest.h"
+#include "StoreClient.h"
 #include "tools.h"
 #if USE_AUTH
 #include "auth/UserRequest.h"

diff --git a/src/stmem.h b/src/stmem.h
index c7b53981a2bd448a002c0a36dd203bfa107c5a0d..e67e4d360abf7d1e196d5d6565bd2f3a4a4d33a1 100644 (file)
--- a/src/stmem.h
+++ b/src/stmem.h
@@ -33,8 +33,8 @@
 #ifndef SQUID_STMEM_H
 #define SQUID_STMEM_H
 
-#include "splay.h"
 #include "Range.h"
+#include "splay.h"
 
 class mem_node;
 

diff --git a/src/store.cc b/src/store.cc
index 4d6b771bab533c559f9b3e690fb40053ba706ef2..b4a9939f6a54eb75b62f219cd18e28d342744a8f 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -54,12 +54,12 @@
 #include "Stack.h"
 #include "StatCounters.h"
 #include "stmem.h"
+#include "Store.h"
 #include "store_digest.h"
 #include "store_key_md5.h"
 #include "store_key_md5.h"
 #include "store_log.h"
 #include "store_rebuild.h"
-#include "Store.h"
 #include "StoreClient.h"
 #include "StoreIOState.h"
 #include "StoreMeta.h"

diff --git a/src/store_client.cc b/src/store_client.cc
index 9892758f3ef1c84ae5d765cca1ba1ed106fa9cd6..b990e385c21118f26c8a3f4d6bb27075344fa403 100644 (file)
--- a/src/store_client.cc
+++ b/src/store_client.cc
@@ -42,9 +42,9 @@
 #include "profiler/Profiler.h"
 #include "SquidConfig.h"
 #include "StatCounters.h"
-#include "StoreClient.h"
 #include "Store.h"
 #include "store_swapin.h"
+#include "StoreClient.h"
 #include "StoreMeta.h"
 #include "StoreMetaUnpacker.h"
 #if USE_DELAY_POOLS

diff --git a/src/store_dir.cc b/src/store_dir.cc
index 07e8743ffbd9be749bcc5d2ce2162a74390393f5..cade545757edb10547f340169b5bdcfb64297768 100644 (file)
--- a/src/store_dir.cc
+++ b/src/store_dir.cc
@@ -43,8 +43,8 @@
 #include "Store.h"
 #include "store_key_md5.h"
 #include "StoreHashIndex.h"
-#include "SwapDir.h"
 #include "swap_log_op.h"
+#include "SwapDir.h"
 #include "tools.h"
 
 #if HAVE_STATVFS

diff --git a/src/store_io.cc b/src/store_io.cc
index e2f9d2a2c37def1b4b8257fd4d6d43604caa84ef..93a0a11a6d4d025b6ff3670e9ffdbc62344dc7a4 100644 (file)
--- a/src/store_io.cc
+++ b/src/store_io.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
-#include "Store.h"
 #include "MemObject.h"
 #include "SquidConfig.h"
+#include "Store.h"
 #include "SwapDir.h"
 
 StoreIoStats store_io_stats;

diff --git a/src/store_log.cc b/src/store_log.cc
index c4b32217ae076c57836509fdef0213d547865bab..c88b9a2989a2a2c7cb6f8dcc5b2ebd23b12c3a5b 100644 (file)
--- a/src/store_log.cc
+++ b/src/store_log.cc
@@ -36,10 +36,10 @@
 #include "log/File.h"
 #include "MemObject.h"
 #include "mgr/Registration.h"
-#include "Store.h"
-#include "store_log.h"
 #include "SquidConfig.h"
 #include "SquidTime.h"
+#include "Store.h"
+#include "store_log.h"
 
 static const char *storeLogTags[] = {
     "CREATE",

diff --git a/src/store_rebuild.cc b/src/store_rebuild.cc
index c9cec3747fdef276d97d82b626658c1c8cd54e0d..f9f9de777612fdd57d01161a11e34afb5e1344d7 100644 (file)
--- a/src/store_rebuild.cc
+++ b/src/store_rebuild.cc
@@ -34,15 +34,15 @@
 #include "event.h"
 #include "globals.h"
 #include "md5.h"
+#include "SquidConfig.h"
+#include "SquidTime.h"
 #include "StatCounters.h"
 #include "Store.h"
-#include "store_key_md5.h"
-#include "SwapDir.h"
 #include "store_digest.h"
+#include "store_key_md5.h"
 #include "store_rebuild.h"
 #include "StoreSearch.h"
-#include "SquidConfig.h"
-#include "SquidTime.h"
+#include "SwapDir.h"
 
 #if HAVE_ERRNO_H
 #include <errno.h>
@@ -243,9 +243,9 @@ storeRebuildProgress(int sd_index, int total, int sofar)
 }
 
 #include "fde.h"
-#include "StoreMetaUnpacker.h"
-#include "StoreMeta.h"
 #include "Generic.h"
+#include "StoreMeta.h"
+#include "StoreMetaUnpacker.h"
 
 struct InitStoreEntry : public unary_function<StoreMeta, void> {
     InitStoreEntry(StoreEntry *anEntry, cache_key *aKey):what(anEntry),index(aKey) {}

diff --git a/src/store_swapin.cc b/src/store_swapin.cc
index da4cab34273b1c46b14f9cc6771dac125feef3a8..f092df574a1822022ff0a51575d4c5a1984ef0e8 100644 (file)
--- a/src/store_swapin.cc
+++ b/src/store_swapin.cc
@@ -33,9 +33,9 @@
 #include "squid.h"
 #include "globals.h"
 #include "StatCounters.h"
-#include "StoreClient.h"
 #include "Store.h"
 #include "store_swapin.h"
+#include "StoreClient.h"
 
 static StoreIOState::STIOCB storeSwapInFileClosed;
 static StoreIOState::STFNCB storeSwapInFileNotify;

diff --git a/src/store_swapout.cc b/src/store_swapout.cc
index 9d1ad7266e64c37ea8f4d1d3b1976156ff103b0a..53121e34b4ca48975864c01bb647940da6719875 100644 (file)
--- a/src/store_swapout.cc
+++ b/src/store_swapout.cc
@@ -33,17 +33,17 @@
 
 #include "squid.h"
 #include "cbdata.h"
-#include "StoreClient.h"
 #include "globals.h"
 #include "Store.h"
+#include "StoreClient.h"
 /* FIXME: Abstract the use of this more */
 #include "mem_node.h"
 #include "MemObject.h"
 #include "SquidConfig.h"
-#include "SwapDir.h"
 #include "StatCounters.h"
 #include "store_log.h"
 #include "swap_log_op.h"
+#include "SwapDir.h"
 
 static void storeSwapOutStart(StoreEntry * e);
 static StoreIOState::STIOCB storeSwapOutFileClosed;

diff --git a/src/tests/stub_HelperChildConfig.cc b/src/tests/stub_HelperChildConfig.cc
index 55e4be97bde9780dc2152ed77ab80a568f232a4d..b141f5b43a53b4fec8c6ec4b722aac62380c287c 100644 (file)
--- a/src/tests/stub_HelperChildConfig.cc
+++ b/src/tests/stub_HelperChildConfig.cc
@@ -1,6 +1,6 @@
 #include "squid.h"
-#include "HelperChildConfig.h"
 #include "globals.h"
+#include "HelperChildConfig.h"
 
 #define STUB_API "stub_HelperChildconfig.cc"
 #include "tests/STUB.h"

diff --git a/src/tests/stub_MemObject.cc b/src/tests/stub_MemObject.cc
index 309e8cd7ffb8fc29701b49985224d3d2d5d8ee26..53b54209df307e4ce992aa7f15fa236fd5af389c 100644 (file)
--- a/src/tests/stub_MemObject.cc
+++ b/src/tests/stub_MemObject.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
 #include "comm/Connection.h"
-#include "MemObject.h"
 #include "HttpReply.h"
+#include "MemObject.h"
 #if USE_DELAY_POOLS
 #include "DelayPools.h"
 #endif

diff --git a/src/tests/stub_http.cc b/src/tests/stub_http.cc
index 95497c218874b0847836e6fbc8cc00f0b7d516c6..b85d7f196d7f9caa31deddcc50b243e9e9119101 100644 (file)
--- a/src/tests/stub_http.cc
+++ b/src/tests/stub_http.cc
@@ -1,7 +1,7 @@
 #include "squid.h"
 
-#include "HttpRequest.h"
 #include "HttpReply.h"
+#include "HttpRequest.h"
 
 #define STUB_API "http.cc"
 #include "tests/STUB.h"

diff --git a/src/tests/stub_mem.cc b/src/tests/stub_mem.cc
index 645b14a310fa5bd4a9fce2ca19d87acfdd1d4eb6..3e62c9ebbfef88c51504ef388842aa9329e3d959 100644 (file)
--- a/src/tests/stub_mem.cc
+++ b/src/tests/stub_mem.cc
@@ -5,8 +5,8 @@
 #include "squid.h"
 
 #define STUB_API "stub_mem.cc"
-#include "STUB.h"
 #include "Mem.h"
+#include "STUB.h"
 
 void
 memFreeString(size_t size, void *buf)

diff --git a/src/tests/stub_pconn.cc b/src/tests/stub_pconn.cc
index 3a7fcd3d7287044f8fb3757f39753957377ee9c6..80e3db46fc4854a5323aa6f3b0c125f317edf705 100644 (file)
--- a/src/tests/stub_pconn.cc
+++ b/src/tests/stub_pconn.cc
@@ -2,8 +2,8 @@
  * STUB file for the pconn.cc API
  */
 #include "squid.h"
-#include "pconn.h"
 #include "comm/Connection.h"
+#include "pconn.h"
 
 #define STUB_API "pconn.cc"
 #include "tests/STUB.h"

diff --git a/src/tests/stub_store_client.cc b/src/tests/stub_store_client.cc
index c90f04277ca261969f0d9b509c32b5bca6affa7c..f8c06c21efba32ba9bec03981c11ebf485fa4815 100644 (file)
--- a/src/tests/stub_store_client.cc
+++ b/src/tests/stub_store_client.cc
@@ -1,6 +1,6 @@
 #include "squid.h"
-#include "StoreClient.h"
 #include "Store.h"
+#include "StoreClient.h"
 
 #define STUB_API "store_client.cc"
 #include "tests/STUB.h"

diff --git a/src/tests/testACLMaxUserIP.cc b/src/tests/testACLMaxUserIP.cc
index c1e4fce924c3cfbb42737905c4f67153fffead43..128806264f0afca5213d43494e5b42ba65e23e78 100644 (file)
--- a/src/tests/testACLMaxUserIP.cc
+++ b/src/tests/testACLMaxUserIP.cc
@@ -4,9 +4,9 @@
 
 #if USE_AUTH
 
-#include "testACLMaxUserIP.h"
 #include "auth/AclMaxUserIp.h"
 #include "ConfigParser.h"
+#include "testACLMaxUserIP.h"
 
 #if HAVE_STDEXCEPT
 #include <stdexcept>

diff --git a/src/tests/testAuth.cc b/src/tests/testAuth.cc
index bb1cffc9eefa63cb5a1366aa04bf6f87f503a6f4..c7358fefaf6cb79e58181cf90aeeb4957028b130 100644 (file)
--- a/src/tests/testAuth.cc
+++ b/src/tests/testAuth.cc
@@ -4,13 +4,13 @@
 
 #if USE_AUTH
 
-#include "testAuth.h"
+#include "auth/Config.h"
 #include "auth/Gadgets.h"
-#include "auth/UserRequest.h"
 #include "auth/Scheme.h"
-#include "auth/Config.h"
+#include "auth/UserRequest.h"
 #include "ConfigParser.h"
 #include "Mem.h"
+#include "testAuth.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testAuth );
 CPPUNIT_TEST_SUITE_REGISTRATION( testAuthConfig );

diff --git a/src/tests/testCacheManager.cc b/src/tests/testCacheManager.cc
index 308ba3543194e07ff1975295b12ae056e3e4e618..7d6691eed34ec4b943624e7c95318d2e1912eac9 100644 (file)
--- a/src/tests/testCacheManager.cc
+++ b/src/tests/testCacheManager.cc
@@ -1,11 +1,11 @@
 #define SQUID_UNIT_TEST 1
 
 #include "squid.h"
-#include "mgr/Action.h"
-#include "Mem.h"
-#include "testCacheManager.h"
 #include "CacheManager.h"
+#include "Mem.h"
+#include "mgr/Action.h"
 #include "Store.h"
+#include "testCacheManager.h"
 
 #include <cppunit/TestAssert.h>
 

diff --git a/src/tests/testConfigParser.cc b/src/tests/testConfigParser.cc
index a7cd80dbcd8f7e63d27bf5826ed7e5474f5fc2c7..3c9bdd24ad7829759cd20894e1c2a51019cb1993 100644 (file)
--- a/src/tests/testConfigParser.cc
+++ b/src/tests/testConfigParser.cc
@@ -1,10 +1,10 @@
 #define SQUID_UNIT_TEST 1
 #include "squid.h"
-#include "testConfigParser.h"
-#include "SquidString.h"
-#include "Mem.h"
-#include "event.h"
 #include "ConfigParser.h"
+#include "event.h"
+#include "Mem.h"
+#include "SquidString.h"
+#include "testConfigParser.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testConfigParser);
 

diff --git a/src/tests/testDiskIO.cc b/src/tests/testDiskIO.cc
index 7ba797b177d155b4cb6d8fcd49786a4fa5e51429..2325937201e5e3ae7e0ab1c7b7a0888d689a62f6 100644 (file)
--- a/src/tests/testDiskIO.cc
+++ b/src/tests/testDiskIO.cc
@@ -1,15 +1,15 @@
 #define SQUID_UNIT_TEST 1
 
 #include "squid.h"
-#include "testDiskIO.h"
-#include "Store.h"
-#include "SwapDir.h"
 #include "DiskIO/DiskIOModule.h"
-#include "Mem.h"
-#include "MemObject.h"
 #include "HttpHeader.h"
 #include "HttpReply.h"
+#include "Mem.h"
+#include "MemObject.h"
+#include "Store.h"
 #include "StoreFileSystem.h"
+#include "SwapDir.h"
+#include "testDiskIO.h"
 #include "testStoreSupport.h"
 
 #if HAVE_STDEXCEPT

diff --git a/src/tests/testEventLoop.cc b/src/tests/testEventLoop.cc
index 6abcf9ace636e470719c6ca1786b1fa090fe4ded..b7b50925ee7794f71fcee8a0935ef0e08e782585 100644 (file)
--- a/src/tests/testEventLoop.cc
+++ b/src/tests/testEventLoop.cc
@@ -3,12 +3,12 @@
 
 #include <cppunit/TestAssert.h>
 
-#include "testEventLoop.h"
 #include "AsyncEngine.h"
 #include "EventLoop.h"
 #include "Mem.h"
 #include "SquidTime.h"
 #include "stat.h"
+#include "testEventLoop.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testEventLoop );
 

diff --git a/src/tests/testHttpParser.cc b/src/tests/testHttpParser.cc
index 5dde9b28d21bd890292ce765c3fd84d40ba07224..446d9f046dfd9a6b18bb1a5b567cbcb08b91f0bb 100644 (file)
--- a/src/tests/testHttpParser.cc
+++ b/src/tests/testHttpParser.cc
@@ -3,11 +3,11 @@
 
 #include <cppunit/TestAssert.h>
 
-#include "testHttpParser.h"
 #include "HttpParser.h"
 #include "Mem.h"
 #include "MemBuf.h"
 #include "SquidConfig.h"
+#include "testHttpParser.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testHttpParser );
 

diff --git a/src/tests/testHttpReply.cc b/src/tests/testHttpReply.cc
index 04aa5ab9a84da4a74b90e64e489fe62083f3f9c3..d3c378b957fe2c3e5554c9197e11c7bd8fcabdc1 100644 (file)
--- a/src/tests/testHttpReply.cc
+++ b/src/tests/testHttpReply.cc
@@ -2,12 +2,12 @@
 #include "squid.h"
 #include <cppunit/TestAssert.h>
 
-#include "testHttpReply.h"
 #include "HttpHeader.h"
 #include "HttpReply.h"
 #include "Mem.h"
 #include "mime_header.h"
 #include "SquidConfig.h"
+#include "testHttpReply.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testHttpReply );
 

diff --git a/src/tests/testHttpRequest.cc b/src/tests/testHttpRequest.cc
index 1f1ce12faf8e5525e6a8c7b3783cd0947adcac74..a44fc213f2109738be35f3a7a8e710c3708c0dbc 100644 (file)
--- a/src/tests/testHttpRequest.cc
+++ b/src/tests/testHttpRequest.cc
@@ -3,11 +3,11 @@
 
 #include <cppunit/TestAssert.h>
 
-#include "testHttpRequest.h"
 #include "HttpHeader.h"
 #include "HttpRequest.h"
 #include "Mem.h"
 #include "mime_header.h"
+#include "testHttpRequest.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testHttpRequest );
 

diff --git a/src/tests/testHttpRequestMethod.cc b/src/tests/testHttpRequestMethod.cc
index 3855514c22626057211d5e4bad7bf24fe9a85d33..1e83ed1ce3c402e504107e4cbcbcd163cdffecb9 100644 (file)
--- a/src/tests/testHttpRequestMethod.cc
+++ b/src/tests/testHttpRequestMethod.cc
@@ -3,9 +3,9 @@
 #include "squid.h"
 #include <cppunit/TestAssert.h>
 
+#include "HttpRequestMethod.h"
 #include "Mem.h"
 #include "testHttpRequestMethod.h"
-#include "HttpRequestMethod.h"
 
 #if HAVE_SSTREAM
 #include <sstream>

diff --git a/src/tests/testSBuf.cc b/src/tests/testSBuf.cc
index 49561b453a2af7c0bab89d417e34f6c3578c4c9e..479a9c21e0d9734d77aa2c85114cf8ff0925d917 100644 (file)
--- a/src/tests/testSBuf.cc
+++ b/src/tests/testSBuf.cc
@@ -1,10 +1,10 @@
 #include "squid.h"
 #include "Mem.h"
 #include "SBuf.h"
+#include "SBufFindTest.h"
 #include "SBufStream.h"
 #include "SquidString.h"
 #include "testSBuf.h"
-#include "SBufFindTest.h"
 
 #include <iostream>
 #include <stdexcept>

diff --git a/src/tests/testStatHist.cc b/src/tests/testStatHist.cc
index c6254c071a98ec28a98963afdb5ae61e5116b55a..545c7046dfb83ca0ef41c20f6fba521e1634d56e 100644 (file)
--- a/src/tests/testStatHist.cc
+++ b/src/tests/testStatHist.cc
@@ -1,7 +1,7 @@
 #define SQUID_UNIT_TEST 1
 #include "squid.h"
-#include "testStatHist.h"
 #include "StatHist.h"
+#include "testStatHist.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION(testStatHist);
 

diff --git a/src/tests/testStore.cc b/src/tests/testStore.cc
index 0c4989d25a814a669fb015108e6a2955c27aac80..8560f47bcd7082c58acf99b1331dd0c49061a190 100644 (file)
--- a/src/tests/testStore.cc
+++ b/src/tests/testStore.cc
@@ -1,8 +1,8 @@
 #define SQUID_UNIT_TEST 1
 
 #include "squid.h"
-#include "testStore.h"
 #include "Store.h"
+#include "testStore.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testStore );
 

diff --git a/src/tests/testStoreController.cc b/src/tests/testStoreController.cc
index 21e62cece9800005121764d5ab18c0c171c413c5..328b983ba165c846c7b442c6c41c2bf415e0144e 100644 (file)
--- a/src/tests/testStoreController.cc
+++ b/src/tests/testStoreController.cc
@@ -1,14 +1,14 @@
 #define SQUID_UNIT_TEST 1
 
 #include "squid.h"
-#include "testStoreController.h"
-#include "Store.h"
-#include "SwapDir.h"
-#include "TestSwapDir.h"
 #include "Mem.h"
 #include "SquidConfig.h"
 #include "SquidTime.h"
+#include "Store.h"
 #include "StoreSearch.h"
+#include "SwapDir.h"
+#include "testStoreController.h"
+#include "TestSwapDir.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testStoreController );
 

diff --git a/src/tests/testStoreEntryStream.cc b/src/tests/testStoreEntryStream.cc
index 4b0abdc4b23495b8e426ed3484c5bc3217fcaed8..28e0818a8de9c49db9f079340b8b4a184c425799 100644 (file)
--- a/src/tests/testStoreEntryStream.cc
+++ b/src/tests/testStoreEntryStream.cc
@@ -1,12 +1,12 @@
 #define SQUID_UNIT_TEST 1
 
 #include "squid.h"
-#include "Mem.h"
-#include "testStore.h"
-#include "testStoreEntryStream.h"
 #include "CapturingStoreEntry.h"
+#include "Mem.h"
 #include "Store.h"
 #include "StoreEntryStream.h"
+#include "testStore.h"
+#include "testStoreEntryStream.h"
 
 #if HAVE_IOMANIP
 #include <iomanip>

diff --git a/src/tests/testStoreHashIndex.cc b/src/tests/testStoreHashIndex.cc
index 9d320794f4f83f2f7c217f9f6027b63fe669d5be..17cc99cc68bc06b7f8196c885a97cd4baf5be836 100644 (file)
--- a/src/tests/testStoreHashIndex.cc
+++ b/src/tests/testStoreHashIndex.cc
@@ -1,15 +1,15 @@
 #define SQUID_UNIT_TEST 1
 
 #include "squid.h"
-#include "testStoreHashIndex.h"
-#include "Store.h"
-#include "SwapDir.h"
-#include "TestSwapDir.h"
-#include "StoreHashIndex.h"
 #include "Mem.h"
-#include "StoreSearch.h"
 #include "SquidConfig.h"
 #include "SquidTime.h"
+#include "Store.h"
+#include "StoreHashIndex.h"
+#include "StoreSearch.h"
+#include "SwapDir.h"
+#include "testStoreHashIndex.h"
+#include "TestSwapDir.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testStoreHashIndex );
 

diff --git a/src/tests/testStoreSupport.cc b/src/tests/testStoreSupport.cc
index 89664c54936b771dd28cd65e32c1b900246df12d..2db03c4f42b6380cefd80548b309f7db37ef5c63 100644 (file)
--- a/src/tests/testStoreSupport.cc
+++ b/src/tests/testStoreSupport.cc
@@ -33,10 +33,10 @@
 
 #define SQUID_UNIT_TEST 1
 #include "squid.h"
-#include "testStoreSupport.h"
 #include "event.h"
 #include "EventLoop.h"
 #include "SquidTime.h"
+#include "testStoreSupport.h"
 
 /* construct a stock loop with event dispatching, a time service that advances
  * 1 second a tick

diff --git a/src/tests/testString.cc b/src/tests/testString.cc
index 0ca8cb01b475e4cf684a84dce58441a582c3a2a6..090d426ee4ed5d5abe49f1ebb087ee8138ad8a47 100644 (file)
--- a/src/tests/testString.cc
+++ b/src/tests/testString.cc
@@ -1,10 +1,10 @@
 #define SQUID_UNIT_TEST 1
 
 #include "squid.h"
-#include "testString.h"
-#include "SquidString.h"
-#include "Mem.h"
 #include "event.h"
+#include "Mem.h"
+#include "SquidString.h"
+#include "testString.h"
 
 CPPUNIT_TEST_SUITE_REGISTRATION( testString );
 

diff --git a/src/tests/testURL.cc b/src/tests/testURL.cc
index 89997eac765d03a1e813f7763495215a6306298d..379d431e9d25aec330078506b9f2d644b8c63d6b 100644 (file)
--- a/src/tests/testURL.cc
+++ b/src/tests/testURL.cc
@@ -3,9 +3,9 @@
 
 #include <cppunit/TestAssert.h>
 
+#include "Mem.h"
 #include "testURL.h"
 #include "URL.h"
-#include "Mem.h"
 
 #if HAVE_SSTREAM
 #include <sstream>

diff --git a/src/tests/test_http_range.cc b/src/tests/test_http_range.cc
index 03d513972a9b709418ee5d2568dee77f8c8a7573..bbf05445121f4df5e8e9abc07cf01e2a83ded17b 100644 (file)
--- a/src/tests/test_http_range.cc
+++ b/src/tests/test_http_range.cc
@@ -39,8 +39,8 @@
 
 /** \todo CLEANUP: This file shoudl be called something_stub.cc */
 
-#include "HttpHeaderRange.h"
 #include "HttpHeader.h"
+#include "HttpHeaderRange.h"
 #include "Mem.h"
 
 #if 0

diff --git a/src/tools.cc b/src/tools.cc
index a57af62dbc9f8993b16123e87f9d1965758d4a91..d4b75da3d3116dd80d3571deed13395367846fbe 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -31,6 +31,7 @@
  */
 
 #include "squid.h"
+#include "anyp/PortCfg.h"
 #include "base/Subscription.h"
 #include "client_side.h"
 #include "disk.h"
@@ -40,16 +41,15 @@
 #include "ICP.h"
 #include "ip/Intercept.h"
 #include "ip/QosConfig.h"
+#include "ipc/Coordinator.h"
+#include "ipc/Kids.h"
+#include "ipcache.h"
 #include "MemBuf.h"
-#include "anyp/PortCfg.h"
 #include "SquidConfig.h"
 #include "SquidMath.h"
 #include "SquidTime.h"
-#include "ipc/Kids.h"
-#include "ipc/Coordinator.h"
-#include "ipcache.h"
-#include "tools.h"
 #include "SwapDir.h"
+#include "tools.h"
 #include "wordlist.h"
 
 #if HAVE_SYS_PRCTL_H

diff --git a/src/tunnel.cc b/src/tunnel.cc
index 37cc5f700b4cdccbe73fbd4a7e60d933f501a159..c44c21848b2b76f686a2a4d96b0a191f70867abe 100644 (file)
--- a/src/tunnel.cc
+++ b/src/tunnel.cc
@@ -35,8 +35,8 @@
 #include "acl/FilledChecklist.h"
 #include "base/Vector.h"
 #include "CachePeer.h"
-#include "client_side_request.h"
 #include "client_side.h"
+#include "client_side_request.h"
 #include "comm.h"
 #include "comm/Connection.h"
 #include "comm/ConnOpener.h"

diff --git a/src/ufsdump.cc b/src/ufsdump.cc
index c5fd2a1e213d694476555664c583488d0e4b89b7..b9f0276db95bd704435e1258662e1048f17b4f07 100644 (file)
--- a/src/ufsdump.cc
+++ b/src/ufsdump.cc
@@ -31,12 +31,12 @@
  */
 
 #include "squid.h"
-#include "StoreMeta.h"
-#include "StoreMetaUnpacker.h"
-#include "Store.h"
-#include "store_key_md5.h"
 #include "Generic.h"
 #include "mgr/Registration.h"
+#include "Store.h"
+#include "store_key_md5.h"
+#include "StoreMeta.h"
+#include "StoreMetaUnpacker.h"
 
 #undef malloc
 #undef free

diff --git a/src/unlinkd.cc b/src/unlinkd.cc
index 38d066f85095552bf03e5421c0a878edee784582..1a140485cef7e9653d5bb4d4d76ac06eae9643db 100644 (file)
--- a/src/unlinkd.cc
+++ b/src/unlinkd.cc
@@ -37,12 +37,12 @@
 #include "fd.h"
 #include "fde.h"
 #include "globals.h"
-#include "xusleep.h"
 #include "SquidIpc.h"
 #include "SquidTime.h"
 #include "StatCounters.h"
 #include "SwapDir.h"
 #include "tools.h"
+#include "xusleep.h"
 
 /* This code gets linked to Squid */
 

diff --git a/src/wordlist.cc b/src/wordlist.cc
index 21076ed0cc043c900713560a32dd9d23f0155262..8a9bdc09d7cb0b0292fed8b242708eceabe268c2 100644 (file)
--- a/src/wordlist.cc
+++ b/src/wordlist.cc
@@ -32,8 +32,8 @@
  */
 
 #include "squid.h"
-#include "wordlist.h"
 #include "MemBuf.h"
+#include "wordlist.h"
 
 void
 wordlistDestroy(wordlist ** list)

diff --git a/test-suite/mem_hdr_test.cc b/test-suite/mem_hdr_test.cc
index a79ea2b2e83dc1a7d8d0140ea52121a02970f7ac..4b5bc367381a5493f3b182415744b42cc72c1b81 100644 (file)
--- a/test-suite/mem_hdr_test.cc
+++ b/test-suite/mem_hdr_test.cc
@@ -33,10 +33,10 @@
  */
 
 #include "squid.h"
-#include "stmem.h"
-#include "mem_node.h"
-#include "Generic.h"
 #include "base/TextException.h"
+#include "Generic.h"
+#include "mem_node.h"
+#include "stmem.h"
 
 #if HAVE_IOSTREAM
 #include <iostream>

diff --git a/test-suite/syntheticoperators.cc b/test-suite/syntheticoperators.cc
index 663890f073cb5883bffb1b64d65157d5cced1973..f6f06ba783489ecd949f6dfced706ce21f15ff75 100644 (file)
--- a/test-suite/syntheticoperators.cc
+++ b/test-suite/syntheticoperators.cc
@@ -32,8 +32,8 @@
  */
 
 #include "squid.h"
-#include "stmem.h"
 #include "mem_node.h"
+#include "stmem.h"
 
 #if HAVE_IOSTREAM
 #include <iostream>

diff --git a/tools/purge/purge.cc b/tools/purge/purge.cc
index 81baffeb388806d93f814d0a09c9453c2ab53a6d..558379e1ba9a46bcddf929956e40faa6532356db 100644 (file)
--- a/tools/purge/purge.cc
+++ b/tools/purge/purge.cc
@@ -115,12 +115,12 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
+#include "conffile.hh"
 #include "convert.hh"
-#include "socket.hh"
+#include "copyout.hh"
 #include "signal.hh"
+#include "socket.hh"
 #include "squid-tlv.hh"
-#include "copyout.hh"
-#include "conffile.hh"
 
 #ifndef DEFAULTHOST
 #define DEFAULTHOST "localhost"