]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
SourceFormat Enforcement
authorAutomatic source maintenance <squidadm@squid-cache.org>
Wed, 3 Sep 2014 00:15:15 +0000 (18:15 -0600)
committerAutomatic source maintenance <squidadm@squid-cache.org>
Wed, 3 Sep 2014 00:15:15 +0000 (18:15 -0600)
src/client_side.cc
src/log/access_log.cc

index 0304e212f3578dc8ec734320b30f7853de24e4ed..b7e55b8185da49c5119f4cccf68912884a77515f 100644 (file)
@@ -2962,7 +2962,7 @@ ConnStateData::parseProxyProtocolHeader()
 
     // detect and parse PROXY/1.0 protocol header
     if (in.buf.startsWith(Proxy1p0magic))
-         return parseProxy1p0();
+        return parseProxy1p0();
 
     // detect and terminate other protocols
     if (in.buf.length() >= Proxy2p0magic.length()) {
@@ -3006,7 +3006,7 @@ ConnStateData::parseProxy1p0()
 
         // skip TCP/IP version number
         static const CharacterSet tcpVersions("TCP-version","46");
-        if(!tok.skipOne(tcpVersions))
+        if (!tok.skipOne(tcpVersions))
             return proxyProtocolError("PROXY/1.0 error: missing TCP version");
 
         // skip SP after protocol version
@@ -3117,15 +3117,15 @@ ConnStateData::parseProxy2p0()
             uint16_t dst_port;
         } ipv4_addr;
         struct {        /* for TCP/UDP over IPv6, len = 36 */
-             struct in6_addr src_addr;
-             struct in6_addr dst_addr;
-             uint16_t src_port;
-             uint16_t dst_port;
+            struct in6_addr src_addr;
+            struct in6_addr dst_addr;
+            uint16_t src_port;
+            uint16_t dst_port;
         } ipv6_addr;
 #if NOT_SUPPORTED
         struct {        /* for AF_UNIX sockets, len = 216 */
-             uint8_t src_addr[108];
-             uint8_t dst_addr[108];
+            uint8_t src_addr[108];
+            uint8_t dst_addr[108];
         } unix_addr;
 #endif
     };
@@ -3135,8 +3135,7 @@ ConnStateData::parseProxy2p0()
 
     // replace the client connection values
     debugs(33, 5, "PROXY/2.0 protocol on connection " << clientConnection);
-    switch (family)
-    {
+    switch (family) {
     case 0x1: // IPv4
         clientConnection->local = ipu.ipv4_addr.dst_addr;
         clientConnection->local.port(ntohs(ipu.ipv4_addr.dst_port));
index bd5ae9a6cf87dc178324e171873f441d6471f1af..b9e85dbb650b0619a6e32913e81b51ee09237be0 100644 (file)
@@ -302,9 +302,10 @@ HierarchyLogEntry::startPeerClock()
 }
 
 void
-HierarchyLogEntry::stopPeerClock(const bool force) {
+HierarchyLogEntry::stopPeerClock(const bool force)
+{
     debugs(46, 5, "First connection started: " << firstConnStart_.tv_sec << "." <<
-           std::setfill('0') << std::setw(6) << firstConnStart_.tv_usec << 
+           std::setfill('0') << std::setw(6) << firstConnStart_.tv_usec <<
            ", current total response time value: " << totalResponseTime_ <<
            (force ? ", force fixing" : ""));
     if (!force && totalResponseTime_ >= 0)