From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Wed, 13 Jan 2010 01:13:17 +0000 (-0700)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_3_2_0_1~465
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97b8ac39779fef68d5b6af8dff2aca3c2cdb3664;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 3c4fda6804..61f1a76083 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -3362,7 +3362,7 @@ clientHttpConnectionsOpen(void)
             continue;
 
         AsyncCall::Pointer call = commCbCall(5,5, "SomeCommAcceptHandler(httpAccept)",
-                                         CommAcceptCbPtrFun(httpAccept, s));
+                                             CommAcceptCbPtrFun(httpAccept, s));
 
         s->listener = new Comm::ListenStateData(fd, call, true);
 
@@ -3416,7 +3416,7 @@ clientHttpsConnectionsOpen(void)
             continue;
 
         AsyncCall::Pointer call = commCbCall(5,5, "SomeCommAcceptHandler(httpsAccept)",
-                                         CommAcceptCbPtrFun(httpsAccept, s));
+                                             CommAcceptCbPtrFun(httpsAccept, s));
 
         s->listener = new Comm::ListenStateData(fd, call, true);
 
diff --git a/src/comm/AcceptLimiter.h b/src/comm/AcceptLimiter.h
index 4af96bfd25..57313b142c 100644
--- a/src/comm/AcceptLimiter.h
+++ b/src/comm/AcceptLimiter.h
@@ -3,7 +3,8 @@
 
 #include "Array.h"
 
-namespace Comm {
+namespace Comm
+{
 
 class ListenStateData;
 
diff --git a/src/comm/ListenStateData.cc b/src/comm/ListenStateData.cc
index 5e90c69f55..8f6e481d4f 100644
--- a/src/comm/ListenStateData.cc
+++ b/src/comm/ListenStateData.cc
@@ -83,9 +83,9 @@ Comm::ListenStateData::setListen()
 }
 
 Comm::ListenStateData::ListenStateData(int aFd, AsyncCall::Pointer &call, bool accept_many) :
-    fd(aFd),
-    theCallback(call),
-    mayAcceptMore(accept_many)
+        fd(aFd),
+        theCallback(call),
+        mayAcceptMore(accept_many)
 {
     assert(aFd >= 0);
     debugs(5, 5, HERE << "FD " << fd << " AsyncCall: " << call);
@@ -119,8 +119,7 @@ Comm::ListenStateData::doAccept(int fd, void *data)
 
     if (!okToAccept()) {
         AcceptLimiter::Instance().defer(afd);
-    }
-    else {
+    } else {
         afd->acceptNext();
     }
     commSetSelect(fd, COMM_SELECT_READ, Comm::ListenStateData::doAccept, afd, 0);
@@ -210,7 +209,7 @@ Comm::ListenStateData::notify(int newfd, comm_err_t errcode, int xerrno, const C
 }
 
 /**
- * accept() and process 
+ * accept() and process
  * Wait for an incoming connection on FD.
  */
 int
diff --git a/src/comm/ListenStateData.h b/src/comm/ListenStateData.h
index a349d648b1..c7bdc7be2d 100644
--- a/src/comm/ListenStateData.h
+++ b/src/comm/ListenStateData.h
@@ -10,7 +10,8 @@
 
 class ConnectionDetail;
 
-namespace Comm {
+namespace Comm
+{
 
 class ListenStateData
 {
diff --git a/src/ftp.cc b/src/ftp.cc
index 45dca5ab8f..fe97f65403 100644
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -3959,8 +3959,7 @@ FtpChannel::close()
         comm_remove_close_handler(fd, closer);
         closer = NULL;
         fd = -1;
-    }
-    else if (fd >= 0) {
+    } else if (fd >= 0) {
         comm_remove_close_handler(fd, closer);
         closer = NULL;
         comm_close(fd); // we do not expect to be called back