From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Thu, 4 Oct 2012 00:23:44 +0000 (-0600)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_3_3_0_1~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4a1460004fe2ec47573759e0afd739c4b9b2ce0;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/CacheManager.h b/src/CacheManager.h
index bb5885557f..9cd09df070 100644
--- a/src/CacheManager.h
+++ b/src/CacheManager.h
@@ -50,7 +50,8 @@
  */
 
 class HttpRequest;
-namespace Mgr {
+namespace Mgr
+{
 class ActionPasswordList;
 } //namespace Mgr
 /**
diff --git a/src/SnmpRequest.h b/src/SnmpRequest.h
index c6c3a79d8f..0820de19d3 100644
--- a/src/SnmpRequest.h
+++ b/src/SnmpRequest.h
@@ -1,8 +1,8 @@
 #ifndef SQUID_SNMPREQUEST_H_
 #define SQUID_SNMPREQUEST_H_
 /*
- * DEBUG: section 
- * AUTHOR: 
+ * DEBUG: section
+ * AUTHOR:
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
diff --git a/src/SquidConfig.h b/src/SquidConfig.h
index 2f2c028dba..88af4bde47 100644
--- a/src/SquidConfig.h
+++ b/src/SquidConfig.h
@@ -48,7 +48,8 @@ class sslproxy_cert_adapt;
 class acl_access;
 class AclSizeLimit;
 class AclDenyInfoList;
-namespace Mgr {
+namespace Mgr
+{
 class ActionPasswordList;
 } // namespace Mgr
 class CustomLog;
@@ -59,7 +60,8 @@ class RefreshPattern;
 class RemovalPolicySettings;
 class SwapDir;
 
-namespace AnyP {
+namespace AnyP
+{
 class PortCfg;
 }
 
diff --git a/src/acl/AclSizeLimit.h b/src/acl/AclSizeLimit.h
index 6a19f2df31..ed6e4f0401 100644
--- a/src/acl/AclSizeLimit.h
+++ b/src/acl/AclSizeLimit.h
@@ -32,7 +32,8 @@
 class ACLList;
 /// representation of a class of Size-limit ACLs
 // a POD. TODO: convert to new ACL framework
-class AclSizeLimit {
+class AclSizeLimit
+{
 public:
     AclSizeLimit *next;
     ACLList *aclList;
diff --git a/src/client_db.h b/src/client_db.h
index 4a7765af0c..41109c6519 100644
--- a/src/client_db.h
+++ b/src/client_db.h
@@ -36,7 +36,8 @@
 #include "anyp/ProtocolType.h"
 #include "enums.h"
 #include "ip/Address.h"
-namespace Ip {
+namespace Ip
+{
 class Address;
 }
 
diff --git a/src/client_side.cc b/src/client_side.cc
index af885f556b..c2c41acade 100644
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -2656,7 +2656,7 @@ clientProcessRequest(ConnStateData *conn, HttpParser *hp, ClientSocketContext *c
     request->flags.ignoreCc = conn->port->ignore_cc;
     // TODO: decouple http->flags.accel from request->flags.sslBumped
     request->flags.noDirect = (request->flags.accelerated && !request->flags.sslBumped) ?
-                               !conn->port->allow_direct : 0;
+                              !conn->port->allow_direct : 0;
 #if USE_AUTH
     if (request->flags.sslBumped) {
         if (conn->auth_user_request != NULL)
diff --git a/src/client_side.h b/src/client_side.h
index 279aaf6ea4..6185817102 100644
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -53,8 +53,9 @@ class ConnStateData;
 class ClientHttpRequest;
 class clientStreamNode;
 class ChunkedCodingParser;
-namespace AnyP {
-    class PortCfg;
+namespace AnyP
+{
+class PortCfg;
 } // namespace Anyp
 
 /**
diff --git a/src/comm.h b/src/comm.h
index ad723d8d20..7c0f228078 100644
--- a/src/comm.h
+++ b/src/comm.h
@@ -8,7 +8,8 @@
 #include "comm/IoCallback.h"
 #include "StoreIOBuffer.h"
 
-namespace Ip {
+namespace Ip
+{
 class Address;
 }
 
diff --git a/src/fde.h b/src/fde.h
index 57ee4241b7..19baa4da51 100644
--- a/src/fde.h
+++ b/src/fde.h
@@ -44,7 +44,8 @@ class ClientInfo;
 
 class PconnPool;
 class dwrite_q;
-class _fde_disk {
+class _fde_disk
+{
 public:
     DWCB *wrt_handle;
     void *wrt_handle_data;
diff --git a/src/ip/QosConfig.h b/src/ip/QosConfig.h
index 2b801648cf..e17377764b 100644
--- a/src/ip/QosConfig.h
+++ b/src/ip/QosConfig.h
@@ -22,7 +22,8 @@ class fde;
 // TODO: move to new ACL framework
 // not integrated in namespace, as this class uses a strange CBDATA definition
 // POD
-class acl_tos {
+class acl_tos
+{
 public:
     acl_tos *next;
     ACLList *aclList;
@@ -31,7 +32,8 @@ public:
 // TODO: move to new ACL framework
 // not integrated in namespace, as this class uses a strange CBDATA definition
 // POD
-class acl_nfmark {
+class acl_nfmark
+{
 public:
     acl_nfmark *next;
     ACLList *aclList;
diff --git a/src/log/CustomLog.h b/src/log/CustomLog.h
index e995bc52e7..77d3af4d61 100644
--- a/src/log/CustomLog.h
+++ b/src/log/CustomLog.h
@@ -33,7 +33,8 @@
 
 class ACLList;
 class Logfile;
-namespace Format {
+namespace Format
+{
 class Format;
 }
 
diff --git a/src/mgr/ActionPasswordList.h b/src/mgr/ActionPasswordList.h
index 36ee10197c..eba5a4335f 100644
--- a/src/mgr/ActionPasswordList.h
+++ b/src/mgr/ActionPasswordList.h
@@ -31,7 +31,8 @@
 
 class wordlist;
 
-namespace Mgr {
+namespace Mgr
+{
 //TODO: refactor into a std::list
 /// list of cachemgr password authorization definitions. Currently a POD.
 class ActionPasswordList
diff --git a/src/neighbors.h b/src/neighbors.h
index a946c38409..78c95f54ed 100644
--- a/src/neighbors.h
+++ b/src/neighbors.h
@@ -48,11 +48,11 @@ CachePeer *getNextPeer(CachePeer *);
 CachePeer *getSingleParent(HttpRequest *);
 int neighborsCount(HttpRequest *);
 int neighborsUdpPing(HttpRequest *,
-                StoreEntry *,
-                IRCB * callback,
-                void *data,
-                int *exprep,
-                int *timeout);
+                     StoreEntry *,
+                     IRCB * callback,
+                     void *data,
+                     int *exprep,
+                     int *timeout);
 void neighborAddAcl(const char *, const char *);
 
 void neighborsUdpAck(const cache_key *, icp_common_t *, const Ip::Address &);
diff --git a/src/ssl/ProxyCerts.h b/src/ssl/ProxyCerts.h
index 22b4edadec..d58b307b7c 100644
--- a/src/ssl/ProxyCerts.h
+++ b/src/ssl/ProxyCerts.h
@@ -32,14 +32,16 @@
 #if USE_SSL
 class ACLList;
 
-class sslproxy_cert_sign {
+class sslproxy_cert_sign
+{
 public:
     int alg;
     ACLList *aclList;
     sslproxy_cert_sign *next;
 };
 
-class sslproxy_cert_adapt {
+class sslproxy_cert_adapt
+{
 public:
     int alg;
     char *param;