From: Source Maintenance <squidadm@squid-cache.org>
Date: Sun, 31 Jan 2016 06:14:05 +0000 (+0000)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_3_5_14~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edb14b35e1f37b60745e7cc7e80e0ad0497efc30;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/acl/DestinationIp.cc b/src/acl/DestinationIp.cc
index aa316f8913..48f5a61384 100644
--- a/src/acl/DestinationIp.cc
+++ b/src/acl/DestinationIp.cc
@@ -40,7 +40,7 @@ ACLDestinationIP::match(ACLChecklist *cl)
     if (Config.onoff.client_dst_passthru && (checklist->request->flags.intercepted || checklist->request->flags.interceptTproxy)) {
         const ConnStateData *conn = checklist->conn();
         return (conn != NULL && conn->clientConnection != NULL) ?
-            ACLIP::match(conn->clientConnection->local) : -1;
+               ACLIP::match(conn->clientConnection->local) : -1;
     }
 
     if (flags.isSet(ACL_F_NO_LOOKUP)) {
diff --git a/src/clients/FtpRelay.cc b/src/clients/FtpRelay.cc
index d277a1963e..599e3161e2 100644
--- a/src/clients/FtpRelay.cc
+++ b/src/clients/FtpRelay.cc
@@ -723,7 +723,7 @@ Ftp::Relay::finalizeDataDownload()
         if (Ftp::Server *srv = dynamic_cast<Ftp::Server*>(mgr.get())) {
             typedef NullaryMemFunT<Ftp::Server> CbDialer;
             AsyncCall::Pointer call = JobCallback(11, 3, CbDialer, srv,
-                                                        Ftp::Server::originDataCompletionCheckpoint);
+                                                  Ftp::Server::originDataCompletionCheckpoint);
             ScheduleCallHere(call);
         }
     }
diff --git a/src/servers/FtpServer.cc b/src/servers/FtpServer.cc
index 87f01314de..e43f76a72d 100644
--- a/src/servers/FtpServer.cc
+++ b/src/servers/FtpServer.cc
@@ -313,7 +313,7 @@ Ftp::Server::clientPinnedConnectionClosed(const CommCloseCbParams &io)
 
     // TODO: If the server control connection is gone, reset state to login
     // again. Reseting login alone is not enough: FtpRelay::sendCommand() will
-    // not re-login because FtpRelay::serverState() is not going to be 
+    // not re-login because FtpRelay::serverState() is not going to be
     // fssConnected. Calling resetLogin() alone is also harmful because
     // it does not reset correctly the client-to-squid control connection (eg
     // respond if required with an error code, in all cases)