From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Thu, 26 Apr 2012 01:04:17 +0000 (-0600)
Subject: SourceFormat Enforcement
X-Git-Tag: BumpSslServerFirst.take08~7^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=04401ab03276b21e8c0352f84705be601408fca2;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 65e0d3dfd0..c1ca4767d9 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -873,37 +873,37 @@ configDoConfigure(void)
 
     Config.ssl_client.sslContext = sslCreateClientContext(Config.ssl_client.cert, Config.ssl_client.key, Config.ssl_client.version, Config.ssl_client.cipher, Config.ssl_client.options, Config.ssl_client.flags, Config.ssl_client.cafile, Config.ssl_client.capath, Config.ssl_client.crlfile);
 
-        for (peer *p = Config.peers; p != NULL; p = p->next) {
-            if (p->use_ssl) {
-                debugs(3, 1, "Initializing cache_peer " << p->name << " SSL context");
-                p->sslContext = sslCreateClientContext(p->sslcert, p->sslkey, p->sslversion, p->sslcipher, p->ssloptions, p->sslflags, p->sslcafile, p->sslcapath, p->sslcrlfile);
-            }
+    for (peer *p = Config.peers; p != NULL; p = p->next) {
+        if (p->use_ssl) {
+            debugs(3, 1, "Initializing cache_peer " << p->name << " SSL context");
+            p->sslContext = sslCreateClientContext(p->sslcert, p->sslkey, p->sslversion, p->sslcipher, p->ssloptions, p->sslflags, p->sslcafile, p->sslcapath, p->sslcrlfile);
         }
+    }
 
-        for (AnyP::PortCfg *s = Config.Sockaddr.http; s != NULL; s = s->next) {
-            if (!s->cert && !s->key)
-                continue;
+    for (AnyP::PortCfg *s = Config.Sockaddr.http; s != NULL; s = s->next) {
+        if (!s->cert && !s->key)
+            continue;
 
-            debugs(3, 1, "Initializing http_port " << s->s << " SSL context");
+        debugs(3, 1, "Initializing http_port " << s->s << " SSL context");
 
-            s->staticSslContext.reset(
-                sslCreateServerContext(s->cert, s->key,
-                                       s->version, s->cipher, s->options, s->sslflags, s->clientca,
-                                       s->cafile, s->capath, s->crlfile, s->dhfile,
-                                       s->sslContextSessionId));
+        s->staticSslContext.reset(
+            sslCreateServerContext(s->cert, s->key,
+                                   s->version, s->cipher, s->options, s->sslflags, s->clientca,
+                                   s->cafile, s->capath, s->crlfile, s->dhfile,
+                                   s->sslContextSessionId));
 
-            Ssl::readCertChainAndPrivateKeyFromFiles(s->signingCert, s->signPkey, s->certsToChain, s->cert, s->key);
-        }
+        Ssl::readCertChainAndPrivateKeyFromFiles(s->signingCert, s->signPkey, s->certsToChain, s->cert, s->key);
+    }
 
-        for (AnyP::PortCfg *s = Config.Sockaddr.https; s != NULL; s = s->next) {
-            debugs(3, 1, "Initializing https_port " << s->s << " SSL context");
+    for (AnyP::PortCfg *s = Config.Sockaddr.https; s != NULL; s = s->next) {
+        debugs(3, 1, "Initializing https_port " << s->s << " SSL context");
 
-            s->staticSslContext.reset(
-                sslCreateServerContext(s->cert, s->key,
-                                       s->version, s->cipher, s->options, s->sslflags, s->clientca,
-                                       s->cafile, s->capath, s->crlfile, s->dhfile,
-                                       s->sslContextSessionId));
-        }
+        s->staticSslContext.reset(
+            sslCreateServerContext(s->cert, s->key,
+                                   s->version, s->cipher, s->options, s->sslflags, s->clientca,
+                                   s->cafile, s->capath, s->crlfile, s->dhfile,
+                                   s->sslContextSessionId));
+    }
 
 #endif
 
diff --git a/src/comm/ModPoll.cc b/src/comm/ModPoll.cc
index baebd1bd9a..69c7222976 100644
--- a/src/comm/ModPoll.cc
+++ b/src/comm/ModPoll.cc
@@ -328,7 +328,7 @@ comm_poll_tcp_incoming(void)
 
     nevents = comm_check_incoming_poll_handlers(nfds, fds);
     incoming_tcp_interval = incoming_tcp_interval
-                             + Config.comm_incoming.tcp.average - nevents;
+                            + Config.comm_incoming.tcp.average - nevents;
 
     if (incoming_tcp_interval < Config.comm_incoming.tcp.min_poll)
         incoming_tcp_interval = Config.comm_incoming.tcp.min_poll;
diff --git a/src/structs.h b/src/structs.h
index 044018297e..cd840a575c 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -145,7 +145,8 @@ class CpuAffinityMap;
 class RemovalPolicySettings;
 class external_acl;
 class Store;
-namespace AnyP {
+namespace AnyP
+{
 struct PortCfg;
 }
 class SwapDir;