From: Automatic source maintenance <squidadm@squid-cache.org>
Date: Sat, 17 Dec 2011 01:26:31 +0000 (-0700)
Subject: SourceFormat Enforcement
X-Git-Tag: BumpSslServerFirst.take05~12^2~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75fbab53dcb347de2688cd4eaba654eb77e12808;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/src/HttpHeaderStat.h b/src/HttpHeaderStat.h
index 9ebdd3f457..7fcff9d045 100644
--- a/src/HttpHeaderStat.h
+++ b/src/HttpHeaderStat.h
@@ -11,7 +11,8 @@
 /* per header statistics */
 
 #include "StatHist.h"
-class HttpHeaderStat {
+class HttpHeaderStat
+{
 public:
     const char *label;
     HttpHeaderMask *owner_mask;
diff --git a/src/StatCounters.h b/src/StatCounters.h
index 8568ff9990..cfedcadc90 100644
--- a/src/StatCounters.h
+++ b/src/StatCounters.h
@@ -36,7 +36,8 @@
 
 #if USE_CACHE_DIGESTS
 /** statistics for cache digests and other hit "predictors" */
-class CacheDigestGuessStats {
+class CacheDigestGuessStats
+{
 public:
     int trueHits;
     int falseHits;
@@ -52,7 +53,8 @@ public:
  * \note if you add a field to StatCounters,
  * you MUST sync statCountersInitSpecial, statCountersClean, and statCountersCopy
  */
-class StatCounters {
+class StatCounters
+{
 public:
     struct {
         int clients;
diff --git a/src/StatHist.cc b/src/StatHist.cc
index ab74eaaf04..82a95ef742 100644
--- a/src/StatHist.cc
+++ b/src/StatHist.cc
@@ -72,7 +72,7 @@ StatHist::init(int newCapacity, hbase_f * val_in_, hbase_f * val_out_, double ne
 void
 StatHist::clear()
 {
-    for(int i=0;i<capacity_;++i)
+    for (int i=0; i<capacity_; ++i)
         bins[i]=0;
 }
 
diff --git a/src/StatHist.h b/src/StatHist.h
index c8bea10d20..bf34cf6c6a 100644
--- a/src/StatHist.h
+++ b/src/StatHist.h
@@ -45,7 +45,8 @@ typedef void StatHistBinDumper(StoreEntry *, int idx, double val, double size, i
  *
  * see important comments on hbase_f restrictions in StatHist.cc
  */
-class StatHist {
+class StatHist
+{
 public:
     /**
      * \note the default constructor doesn't fully initialize.
diff --git a/src/protos.h b/src/protos.h
index 6061e1b7cf..85535539da 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -672,87 +672,87 @@ SQUIDCEXTERN int gethostname(char *, int);
  * hack to allow snmp access to the statistics counters
  */
 class StatCounters;
-SQUIDCEXTERN StatCounters *snmpStatGet(int);
+        SQUIDCEXTERN StatCounters *snmpStatGet(int);
 
-/* Vary support functions */
-SQUIDCEXTERN int varyEvaluateMatch(StoreEntry * entry, HttpRequest * req);
+        /* Vary support functions */
+        SQUIDCEXTERN int varyEvaluateMatch(StoreEntry * entry, HttpRequest * req);
 
-/* CygWin & Windows NT Port */
-/* win32.c */
+        /* CygWin & Windows NT Port */
+        /* win32.c */
 #if _SQUID_WINDOWS_
-SQUIDCEXTERN int WIN32_Subsystem_Init(int *, char ***);
-SQUIDCEXTERN void WIN32_sendSignal(int);
-SQUIDCEXTERN void WIN32_Abort(int);
-SQUIDCEXTERN void WIN32_Exit(void);
-SQUIDCEXTERN void WIN32_SetServiceCommandLine(void);
-SQUIDCEXTERN void WIN32_InstallService(void);
-SQUIDCEXTERN void WIN32_RemoveService(void);
-SQUIDCEXTERN int SquidMain(int, char **);
+        SQUIDCEXTERN int WIN32_Subsystem_Init(int *, char ***);
+        SQUIDCEXTERN void WIN32_sendSignal(int);
+        SQUIDCEXTERN void WIN32_Abort(int);
+        SQUIDCEXTERN void WIN32_Exit(void);
+        SQUIDCEXTERN void WIN32_SetServiceCommandLine(void);
+        SQUIDCEXTERN void WIN32_InstallService(void);
+        SQUIDCEXTERN void WIN32_RemoveService(void);
+        SQUIDCEXTERN int SquidMain(int, char **);
 #endif /* _SQUID_WINDOWS_ */
 #if _SQUID_MSWIN_
 
-SQUIDCEXTERN int WIN32_pipe(int[2]);
+        SQUIDCEXTERN int WIN32_pipe(int[2]);
 
-SQUIDCEXTERN int WIN32_getrusage(int, struct rusage *);
-SQUIDCEXTERN void WIN32_ExceptionHandlerInit(void);
+            SQUIDCEXTERN int WIN32_getrusage(int, struct rusage *);
+    SQUIDCEXTERN void WIN32_ExceptionHandlerInit(void);
 
-SQUIDCEXTERN int Win32__WSAFDIsSet(int fd, fd_set* set);
-SQUIDCEXTERN DWORD WIN32_IpAddrChangeMonitorInit();
+    SQUIDCEXTERN int Win32__WSAFDIsSet(int fd, fd_set* set);
+    SQUIDCEXTERN DWORD WIN32_IpAddrChangeMonitorInit();
 
 #endif
 
-/* external_acl.c */
-class external_acl;
-        SQUIDCEXTERN void parse_externalAclHelper(external_acl **);
+    /* external_acl.c */
+    class external_acl;
+            SQUIDCEXTERN void parse_externalAclHelper(external_acl **);
 
-        SQUIDCEXTERN void dump_externalAclHelper(StoreEntry * sentry, const char *name, const external_acl *);
+            SQUIDCEXTERN void dump_externalAclHelper(StoreEntry * sentry, const char *name, const external_acl *);
 
-        SQUIDCEXTERN void free_externalAclHelper(external_acl **);
+            SQUIDCEXTERN void free_externalAclHelper(external_acl **);
 
-        typedef void EAH(void *data, void *result);
-        class ACLChecklist;
-            SQUIDCEXTERN void externalAclLookup(ACLChecklist * ch, void *acl_data, EAH * handler, void *data);
+            typedef void EAH(void *data, void *result);
+            class ACLChecklist;
+                SQUIDCEXTERN void externalAclLookup(ACLChecklist * ch, void *acl_data, EAH * handler, void *data);
 
-            SQUIDCEXTERN void externalAclInit(void);
+                SQUIDCEXTERN void externalAclInit(void);
 
-            SQUIDCEXTERN void externalAclShutdown(void);
+                SQUIDCEXTERN void externalAclShutdown(void);
 
-            SQUIDCEXTERN char *strtokFile(void);
+                SQUIDCEXTERN char *strtokFile(void);
 
 #if USE_WCCPv2
 
-            SQUIDCEXTERN void parse_wccp2_method(int *v);
-            SQUIDCEXTERN void free_wccp2_method(int *v);
-            SQUIDCEXTERN void dump_wccp2_method(StoreEntry * e, const char *label, int v);
-            SQUIDCEXTERN void parse_wccp2_amethod(int *v);
-            SQUIDCEXTERN void free_wccp2_amethod(int *v);
-            SQUIDCEXTERN void dump_wccp2_amethod(StoreEntry * e, const char *label, int v);
+                SQUIDCEXTERN void parse_wccp2_method(int *v);
+                SQUIDCEXTERN void free_wccp2_method(int *v);
+                SQUIDCEXTERN void dump_wccp2_method(StoreEntry * e, const char *label, int v);
+                SQUIDCEXTERN void parse_wccp2_amethod(int *v);
+                SQUIDCEXTERN void free_wccp2_amethod(int *v);
+                SQUIDCEXTERN void dump_wccp2_amethod(StoreEntry * e, const char *label, int v);
 
-            SQUIDCEXTERN void parse_wccp2_service(void *v);
-            SQUIDCEXTERN void free_wccp2_service(void *v);
-            SQUIDCEXTERN void dump_wccp2_service(StoreEntry * e, const char *label, void *v);
+                SQUIDCEXTERN void parse_wccp2_service(void *v);
+                SQUIDCEXTERN void free_wccp2_service(void *v);
+                SQUIDCEXTERN void dump_wccp2_service(StoreEntry * e, const char *label, void *v);
 
-            SQUIDCEXTERN int check_null_wccp2_service(void *v);
+                SQUIDCEXTERN int check_null_wccp2_service(void *v);
 
-            SQUIDCEXTERN void parse_wccp2_service_info(void *v);
+                SQUIDCEXTERN void parse_wccp2_service_info(void *v);
 
-            SQUIDCEXTERN void free_wccp2_service_info(void *v);
+                SQUIDCEXTERN void free_wccp2_service_info(void *v);
 
-            SQUIDCEXTERN void dump_wccp2_service_info(StoreEntry * e, const char *label, void *v);
+                SQUIDCEXTERN void dump_wccp2_service_info(StoreEntry * e, const char *label, void *v);
 
 #endif
 
 #if USE_AUTH
 
 #if HAVE_AUTH_MODULE_NEGOTIATE && HAVE_KRB5 && HAVE_GSSAPI
-            /* upstream proxy authentication */
-            SQUIDCEXTERN char *peer_proxy_negotiate_auth(char *principal_name, char *proxy);
+                /* upstream proxy authentication */
+                SQUIDCEXTERN char *peer_proxy_negotiate_auth(char *principal_name, char *proxy);
 #endif
 
-                namespace Auth {
-        /* call to ensure the auth component schemes exist. */
-        extern void Init(void);
-        } // namespace Auth
+                    namespace Auth {
+            /* call to ensure the auth component schemes exist. */
+            extern void Init(void);
+            } // namespace Auth
 
 #endif /* USE_AUTH */