From: Source Maintenance <squidadm@squid-cache.org>
Date: Thu, 26 Feb 2015 18:12:07 +0000 (+0000)
Subject: SourceFormat Enforcement
X-Git-Tag: merge-candidate-3-v1~239
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1810a0cb46009e16f6751e7da751452f4cc895f4;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/lib/profiler/xprof_type.h b/lib/profiler/xprof_type.h
index 29bdeffcf7..5474c3e951 100644
--- a/lib/profiler/xprof_type.h
+++ b/lib/profiler/xprof_type.h
@@ -46,6 +46,7 @@ typedef enum {
     XPROF_HttpHeader_getCc,
     XPROF_HttpHeaderParse,
     XPROF_HttpMsg_httpMsgParseStep,
+    XPROF_HttpParserParseReplyLine,
     XPROF_HttpParserParseReqLine,
     XPROF_httpRequestFree,
     XPROF_HttpServer_parseOneRequest,
diff --git a/src/clients/Client.cc b/src/clients/Client.cc
index b663ff2554..6754a0695a 100644
--- a/src/clients/Client.cc
+++ b/src/clients/Client.cc
@@ -983,7 +983,7 @@ Client::calcBufferSpaceToReserve(size_t space, const size_t wantSpace) const
 
 #if USE_ADAPTATION
     if (responseBodyBuffer) {
-        return 0;	// Stop reading if already overflowed waiting for ICAP to catch up
+        return 0;   // Stop reading if already overflowed waiting for ICAP to catch up
     }
 
     if (virginBodyDestination != NULL) {
diff --git a/src/http.cc b/src/http.cc
index 2311329e17..f5a9b35397 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -86,12 +86,12 @@ static void copyOneHeaderFromClientsideRequestToUpstreamRequest(const HttpHeader
 void httpHdrAdd(HttpHeader *heads, HttpRequest *request, const AccessLogEntryPointer &al, HeaderWithAclList &headers_add);
 
 HttpStateData::HttpStateData(FwdState *theFwdState) :
-        AsyncJob("HttpStateData"),
-        Client(theFwdState),
-        lastChunk(0),
-        httpChunkDecoder(NULL),
-        payloadSeen(0),
-        payloadTruncated(0)
+    AsyncJob("HttpStateData"),
+    Client(theFwdState),
+    lastChunk(0),
+    httpChunkDecoder(NULL),
+    payloadSeen(0),
+    payloadTruncated(0)
 {
     debugs(11,5,HERE << "HttpStateData " << this << " created");
     ignoreCacheControl = false;
@@ -1221,7 +1221,7 @@ HttpStateData::readReply(const CommIoCbParams &io)
     }
 
         /* Continue to process previously read data */
-        break;
+    break;
 
     case Comm::ENDFILE: // close detected by 0-byte read
         eof = 1;
@@ -1230,7 +1230,7 @@ HttpStateData::readReply(const CommIoCbParams &io)
         /* Continue to process previously read data */
         break;
 
-        // case Comm::COMM_ERROR:
+    // case Comm::COMM_ERROR:
     default: // no other flags should ever occur
         debugs(11, 2, io.conn << ": read failure: " << xstrerr(rd.xerrno));
 
diff --git a/src/http/one/ResponseParser.cc b/src/http/one/ResponseParser.cc
index d3bfc9bc91..84996ab40f 100644
--- a/src/http/one/ResponseParser.cc
+++ b/src/http/one/ResponseParser.cc
@@ -122,8 +122,8 @@ Http::One::ResponseParser::parseResponseFirstLine()
         // tolerant parser MAY accept any of SP, HTAB, VT (%x0B), FF (%x0C), or bare CR
         // as whitespace between status-line fields
         WspDelim += CharacterSet::HTAB
-                  + CharacterSet("VT,FF","\x0B\x0C")
-                  + CharacterSet::CR;
+                    + CharacterSet("VT,FF","\x0B\x0C")
+                    + CharacterSet::CR;
     }
 
     if (msgProtocol_.protocol != AnyP::PROTO_NONE) {
@@ -236,3 +236,4 @@ Http::One::ResponseParser::parse(const SBuf &aBuf)
 
     return !needsMoreData();
 }
+
diff --git a/src/http/one/ResponseParser.h b/src/http/one/ResponseParser.h
index 93f8fd0b8d..54cdf69ca2 100644
--- a/src/http/one/ResponseParser.h
+++ b/src/http/one/ResponseParser.h
@@ -55,3 +55,4 @@ private:
 } // namespace Http
 
 #endif /* _SQUID_SRC_HTTP_ONE_RESPONSEPARSER_H */
+