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

SourceFormat Enforcement
---

diff --git a/src/comm/ConnOpener.cc b/src/comm/ConnOpener.cc
index 06cc08bd69..74c4bce387 100644
--- a/src/comm/ConnOpener.cc
+++ b/src/comm/ConnOpener.cc
@@ -12,9 +12,9 @@
 #include "fde.h"
 #include "globals.h"
 #include "icmp/net_db.h"
+#include "ip/QosConfig.h"
 #include "ip/tools.h"
 #include "ipcache.h"
-#include "ip/QosConfig.h"
 #include "SquidConfig.h"
 #include "SquidTime.h"
 
@@ -263,11 +263,11 @@ Comm::ConnOpener::createFd()
 
     // Set TOS if needed.
     if (conn_->tos &&
-        Ip::Qos::setSockTos(temporaryFd_, conn_->tos, conn_->remote.isIPv4() ? AF_INET : AF_INET6) < 0)
+            Ip::Qos::setSockTos(temporaryFd_, conn_->tos, conn_->remote.isIPv4() ? AF_INET : AF_INET6) < 0)
         conn_->tos = 0;
 #if SO_MARK
     if (conn_->nfmark &&
-        Ip::Qos::setSockNfmark(temporaryFd_, conn_->nfmark) < 0)
+            Ip::Qos::setSockNfmark(temporaryFd_, conn_->nfmark) < 0)
         conn_->nfmark = 0;
 #endif
 
diff --git a/src/comm/TcpAcceptor.cc b/src/comm/TcpAcceptor.cc
index 49b88c5d47..15c5064799 100644
--- a/src/comm/TcpAcceptor.cc
+++ b/src/comm/TcpAcceptor.cc
@@ -206,11 +206,11 @@ Comm::TcpAcceptor::setListen()
     // To correctly implement TOS values on listening sockets, probably requires
     // more work to inherit TOS values to created connection objects.
     if (conn->tos &&
-        Ip::Qos::setSockTos(conn->fd, conn->tos, conn->remote.isIPv4() ? AF_INET : AF_INET6) < 0)
+            Ip::Qos::setSockTos(conn->fd, conn->tos, conn->remote.isIPv4() ? AF_INET : AF_INET6) < 0)
         conn->tos = 0;
 #if SO_MARK
     if (conn->nfmark &&
-        Ip::Qos::setSockNfmark(conn->fd, conn->nfmark) < 0)
+            Ip::Qos::setSockNfmark(conn->fd, conn->nfmark) < 0)
         conn->nfmark = 0;
 #endif
 #endif