------------------------------------------------------------
revno: 13449
revision-id: squidadm@squid-cache.org-20140606001436-elmdc3iss7a5ij5j
parent: squid3@treenet.co.nz-20140605160541-mmaadq1kc8kaez2j
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Thu 2014-06-05 18:14:36 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20140606001436-\
#   elmdc3iss7a5ij5j
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: e429e1ece7380f190af4412651c15a66c620a4fa
# timestamp: 2014-06-06 00:53:53 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20140605160541-\
#   mmaadq1kc8kaez2j
# 
# Begin patch
=== modified file 'src/client_side.cc'
--- src/client_side.cc	2014-06-05 15:57:23 +0000
+++ src/client_side.cc	2014-06-06 00:14:36 +0000
@@ -2987,8 +2987,7 @@
 
     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 @@
         /* 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);

=== modified file 'src/comm/Read.cc'
--- src/comm/Read.cc	2014-06-05 15:13:19 +0000
+++ src/comm/Read.cc	2014-06-06 00:14:36 +0000
@@ -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 @@
         return;
     };
 
-
     /* Nope, register for some more IO */
     Comm::SetSelect(fd, COMM_SELECT_READ, Comm::HandleRead, data, 0);
 }

=== modified file 'src/comm/Read.h'
--- src/comm/Read.h	2014-06-05 14:57:58 +0000
+++ src/comm/Read.h	2014-06-06 00:14:36 +0000
@@ -2,8 +2,8 @@
 #define _SQUID_COMM_READ_H
 
 #include "base/AsyncCall.h"
+#include "comm/forward.h"
 #include "CommCalls.h"
-#include "comm/forward.h"
 
 class SBuf;