From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Thu, 27 Jan 2011 01:12:25 +0000 (-0700)
Subject: SourceFormat Enforcement
X-Git-Tag: take03^2~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db98b2bd97a7be81044418c9013bb3f84c692102;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/CommCalls.h b/src/CommCalls.h
index 7bf0ded84a..945c2d0ca3 100644
--- a/src/CommCalls.h
+++ b/src/CommCalls.h
@@ -268,8 +268,7 @@ public:
 
     inline CommCbFunPtrCallT(const CommCbFunPtrCallT &o) :
             AsyncCall(o.debugSection, o.debugLevel, o.name),
-            dialer(o.dialer)
-        {}
+            dialer(o.dialer) {}
 
     ~CommCbFunPtrCallT() {}
 
diff --git a/src/client_side.cc b/src/client_side.cc
index 391d58e781..f2d90a2609 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -3622,7 +3622,7 @@ clientHttpConnectionsOpen(void)
         Subscription::Pointer sub = new CallSubscription<AcceptCall>(subCall);
 
         AsyncCall::Pointer listenCall = asyncCall(33,2, "clientListenerConnectionOpened",
-                                                  ListeningStartedDialer(&clientListenerConnectionOpened, openFlags, s, Ipc::fdnHttpSocket, sub));
+                                        ListeningStartedDialer(&clientListenerConnectionOpened, openFlags, s, Ipc::fdnHttpSocket, sub));
         Ipc::StartListening(SOCK_STREAM, IPPROTO_TCP, s->s, openFlags, Ipc::fdnHttpSocket, listenCall);
 
         HttpSockets[NHttpSockets++] = -1; // set in clientListenerConnectionOpened
@@ -3689,8 +3689,8 @@ clientHttpsConnectionsOpen(void)
         Subscription::Pointer sub = new CallSubscription<AcceptCall>(subCall);
 
         AsyncCall::Pointer listenCall = asyncCall(33, 2, "clientListenerConnectionOpened",
-                                                  ListeningStartedDialer(&clientListenerConnectionOpened, openFlags,
-                                                                         &s->http, Ipc::fdnHttpsSocket, sub));
+                                        ListeningStartedDialer(&clientListenerConnectionOpened, openFlags,
+                                                               &s->http, Ipc::fdnHttpsSocket, sub));
 
         Ipc::StartListening(SOCK_STREAM, IPPROTO_TCP, s->s, openFlags, Ipc::fdnHttpsSocket, listenCall);
 
diff --git a/src/comm/TcpAcceptor.cc b/src/comm/TcpAcceptor.cc
index 6931a87e39..db0275af0d 100644
--- a/src/comm/TcpAcceptor.cc
+++ b/src/comm/TcpAcceptor.cc
@@ -44,8 +44,9 @@
 #include "protos.h"
 #include "SquidTime.h"
 
-namespace Comm {
-    CBDATA_CLASS_INIT(TcpAcceptor);
+namespace Comm
+{
+CBDATA_CLASS_INIT(TcpAcceptor);
 };
 
 Comm::TcpAcceptor::TcpAcceptor(const int listenFd, const Ip::Address &laddr, int flags,
@@ -193,9 +194,9 @@ Comm::TcpAcceptor::doAccept(int fd, void *data)
         }
         SetSelect(fd, COMM_SELECT_READ, Comm::TcpAcceptor::doAccept, afd, 0);
 
-    } catch(const std::exception &e) {
+    } catch (const std::exception &e) {
         fatalf("FATAL: error while accepting new client connection: %s\n", e.what());
-    } catch(...) {
+    } catch (...) {
         fatal("FATAL: error while accepting new client connection: [unkown]\n");
     }
 }