From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Fri, 6 Jun 2014 00:14:36 +0000 (-0600)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_3_5_0_1~196
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=470b1598cc603bcff73c23c3753c638d0e44f3c4;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/client_side.cc b/src/client_side.cc
index 1e889e89e2..9c8890849b 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -2987,8 +2987,7 @@ ConnStateData::clientReadRequest(const CommIoCbParams &io)
 
     CommIoCbParams rd(this); // will be expanded with ReadNow results
     rd.conn = io.conn;
-    switch (Comm::ReadNow(rd, in.buf))
-    {
+    switch (Comm::ReadNow(rd, in.buf)) {
     case Comm::INPROGRESS:
         if (in.buf.isEmpty())
             debugs(33, 2, io.conn << ": no data to process, " << xstrerr(rd.xerrno));
@@ -3025,7 +3024,7 @@ ConnStateData::clientReadRequest(const CommIoCbParams &io)
         /* Continue to process previously read data */
         break;
 
-    // case Comm::ERROR:
+        // case Comm::ERROR:
     default: // no other flags should ever occur
         debugs(33, 2, io.conn << ": got flag " << rd.flag << "; " << xstrerr(rd.xerrno));
         notifyAllContexts(rd.xerrno);
diff --git a/src/comm/Read.cc b/src/comm/Read.cc
index cccccb1c98..aba2092ba5 100644
--- a/src/comm/Read.cc
+++ b/src/comm/Read.cc
@@ -3,11 +3,11 @@
  */
 #include "squid.h"
 #include "comm.h"
-#include "comm_internal.h"
-#include "CommCalls.h"
 #include "comm/IoCallback.h"
 #include "comm/Loops.h"
 #include "comm/Read.h"
+#include "comm_internal.h"
+#include "CommCalls.h"
 #include "Debug.h"
 #include "fd.h"
 #include "fde.h"
@@ -150,7 +150,6 @@ Comm::HandleRead(int fd, void *data)
         return;
     };
 
-
     /* Nope, register for some more IO */
     Comm::SetSelect(fd, COMM_SELECT_READ, Comm::HandleRead, data, 0);
 }
diff --git a/src/comm/Read.h b/src/comm/Read.h
index 99d78c43c6..4758325b14 100644
--- a/src/comm/Read.h
+++ b/src/comm/Read.h
@@ -2,8 +2,8 @@
 #define _SQUID_COMM_READ_H
 
 #include "base/AsyncCall.h"
-#include "CommCalls.h"
 #include "comm/forward.h"
+#include "CommCalls.h"
 
 class SBuf;