From: Source Maintenance <squidadm@squid-cache.org>
Date: Tue, 26 May 2015 18:12:08 +0000 (+0000)
Subject: SourceFormat Enforcement
X-Git-Tag: merge-candidate-3-v1~100
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f680026f939cb3031a49d83b578972b451275609;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/doc/debug-sections.txt b/doc/debug-sections.txt
index 5bcf776fe1..e444791c97 100644
--- a/doc/debug-sections.txt
+++ b/doc/debug-sections.txt
@@ -107,7 +107,6 @@ section 56    HTTP Message Body
 section 57    HTTP Status-line
 section 58    HTTP Reply (Response)
 section 59    auto-growing Memory Buffer with printf
-section 60    Packer: A uniform interface to store-like modules
 section 61    Redirector
 section 62    Generic Histogram
 section 63    Low Level Memory Pool Management
diff --git a/src/HttpHdrSc.cc b/src/HttpHdrSc.cc
index e233bb47c6..f3bbb1768f 100644
--- a/src/HttpHdrSc.cc
+++ b/src/HttpHdrSc.cc
@@ -246,7 +246,7 @@ HttpHdrScTarget::packInto(Packable * p) const
 
             /* print option name */
             p->appendf((pcount ? ", " SQUIDSTRINGPH : SQUIDSTRINGPH),
-                         SQUIDSTRINGPRINT(ScFieldsInfo[flag].name));
+                       SQUIDSTRINGPRINT(ScFieldsInfo[flag].name));
 
             /* handle options with values */
 
diff --git a/src/clients/FtpClient.cc b/src/clients/FtpClient.cc
index 00caa63abb..7221af6126 100644
--- a/src/clients/FtpClient.cc
+++ b/src/clients/FtpClient.cc
@@ -588,9 +588,9 @@ Ftp::Client::sendEprt()
     /* Which can be used by EITHER protocol. */
     debugs(9, 3, "Listening for FTP data connection on port" << comm_local_port(data.conn->fd) << " or port?" << data.conn->local.port());
     mb.appendf("EPRT |%d|%s|%d|%s",
-              ( data.conn->local.isIPv6() ? 2 : 1 ),
-              data.conn->local.toStr(buf,MAX_IPSTRLEN),
-              comm_local_port(data.conn->fd), Ftp::crlf );
+               ( data.conn->local.isIPv6() ? 2 : 1 ),
+               data.conn->local.toStr(buf,MAX_IPSTRLEN),
+               comm_local_port(data.conn->fd), Ftp::crlf );
 
     state = SENT_EPRT;
     writeCommand(mb.content());
diff --git a/src/clients/FtpGateway.cc b/src/clients/FtpGateway.cc
index 97f3391d46..24ff31b965 100644
--- a/src/clients/FtpGateway.cc
+++ b/src/clients/FtpGateway.cc
@@ -871,17 +871,17 @@ Ftp::Gateway::htmlifyListEntry(const char *line)
     html = new MemBuf();
     html->init();
     html->appendf("<tr class=\"entry\">"
-                 "<td class=\"icon\"><a href=\"%s%s\">%s</a></td>"
-                 "<td class=\"filename\"><a href=\"%s%s\">%s</a></td>"
-                 "<td class=\"date\">%s</td>"
-                 "<td class=\"size\">%s</td>"
-                 "<td class=\"actions\">%s%s%s%s</td>"
-                 "</tr>\n",
-                 prefix, href, icon,
-                 prefix, href, html_quote(text),
-                 parts->date,
-                 size,
-                 chdir, view, download, link);
+                  "<td class=\"icon\"><a href=\"%s%s\">%s</a></td>"
+                  "<td class=\"filename\"><a href=\"%s%s\">%s</a></td>"
+                  "<td class=\"date\">%s</td>"
+                  "<td class=\"size\">%s</td>"
+                  "<td class=\"actions\">%s%s%s%s</td>"
+                  "</tr>\n",
+                  prefix, href, icon,
+                  prefix, href, html_quote(text),
+                  parts->date,
+                  size,
+                  chdir, view, download, link);
 
     ftpListPartsFree(&parts);
     return html;
diff --git a/src/servers/FtpServer.cc b/src/servers/FtpServer.cc
index 98a71d10ec..cfc737b126 100644
--- a/src/servers/FtpServer.cc
+++ b/src/servers/FtpServer.cc
@@ -893,9 +893,9 @@ Ftp::Server::handlePasvReply(const HttpReply *reply, StoreIOBuffer)
     MemBuf mb;
     mb.init();
     mb.appendf("227 Entering Passive Mode (%s,%i,%i).\r\n",
-              addr,
-              static_cast<int>(localPort / 256),
-              static_cast<int>(localPort % 256));
+               addr,
+               static_cast<int>(localPort / 256),
+               static_cast<int>(localPort % 256));
     debugs(9, 3, Raw("writing", mb.buf, mb.size));
     writeReply(mb);
 }
@@ -1085,8 +1085,8 @@ Ftp::Server::writeErrorReply(const HttpReply *reply, const int scode)
     if (request->errDetail > 0) {
         // XXX: > 0 may not always mean that this is an errno
         mb.appendf("%i-Error: (%d) %s\r\n", scode,
-                  request->errDetail,
-                  strerror(request->errDetail));
+                   request->errDetail,
+                   strerror(request->errDetail));
     }
 
 #if USE_ADAPTATION
@@ -1204,7 +1204,7 @@ Ftp::PrintReply(MemBuf &mb, const HttpReply *reply, const char *const)
     if (header.has(HDR_FTP_STATUS)) {
         const char *reason = header.getStr(HDR_FTP_REASON);
         mb.appendf("%i %s\r\n", header.getInt(HDR_FTP_STATUS),
-                  (reason ? reason : 0));
+                   (reason ? reason : 0));
     }
 }
 
diff --git a/src/urn.cc b/src/urn.cc
index 20a08d7070..2bfa4647bf 100644
--- a/src/urn.cc
+++ b/src/urn.cc
@@ -368,9 +368,9 @@ urnHandleReply(void *data, StoreIOBuffer result)
     mb = new MemBuf;
     mb->init();
     mb->appendf( "<TITLE>Select URL for %s</TITLE>\n"
-                "<STYLE type=\"text/css\"><!--BODY{background-color:#ffffff;font-family:verdana,sans-serif}--></STYLE>\n"
-                "<H2>Select URL for %s</H2>\n"
-                "<TABLE BORDER=\"0\" WIDTH=\"100%%\">\n", e->url(), e->url());
+                 "<STYLE type=\"text/css\"><!--BODY{background-color:#ffffff;font-family:verdana,sans-serif}--></STYLE>\n"
+                 "<H2>Select URL for %s</H2>\n"
+                 "<TABLE BORDER=\"0\" WIDTH=\"100%%\">\n", e->url(), e->url());
 
     for (i = 0; i < urlcnt; ++i) {
         u = &urls[i];