From: Source Maintenance <squidadm@squid-cache.org>
Date: Thu, 19 Nov 2015 06:12:03 +0000 (+0000)
Subject: SourceFormat Enforcement
X-Git-Tag: SQUID_4_0_3~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d84d4ca969fb324597e20a21e6ba231dbe2ab2c;p=thirdparty%2Fsquid.git

SourceFormat Enforcement
---

diff --git a/lib/profiler/xprof_type.h b/lib/profiler/xprof_type.h
index 5474c3e951..4349f11538 100644
--- a/lib/profiler/xprof_type.h
+++ b/lib/profiler/xprof_type.h
@@ -70,7 +70,6 @@ typedef enum {
     XPROF_storeClient_kickReads,
     XPROF_storeDirCallback,
     XPROF_StoreEntry_write,
-    XPROF_storeGet,
     XPROF_storeGetMemSpace,
     XPROF_storeMaintainSwapSpace,
     XPROF_storeRelease,
diff --git a/src/Store.h b/src/Store.h
index a8f43f9963..1bb46978be 100644
--- a/src/Store.h
+++ b/src/Store.h
@@ -267,10 +267,9 @@ private:
 /// \ingroup StoreAPI
 typedef void (*STOREGETCLIENT) (StoreEntry *, void *cbdata);
 
-
 namespace Store {
-    void Stats(StoreEntry *output);
-    void Maintain(void *unused);
+void Stats(StoreEntry *output);
+void Maintain(void *unused);
 };
 
 /// \ingroup StoreAPI
diff --git a/src/fs_io.cc b/src/fs_io.cc
index 327e12c239..ba5c6c6664 100644
--- a/src/fs_io.cc
+++ b/src/fs_io.cc
@@ -555,3 +555,4 @@ fsStats(const char *path, int *totl_kb, int *free_kb, int *totl_in, int *free_in
     *free_in = (int) sfs.f_ffree;
     return 0;
 }
+
diff --git a/src/store.cc b/src/store.cc
index 3b22edaab9..0a8162ef20 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -2122,3 +2122,4 @@ NullStoreEntry::getSerialisedMetaData()
 {
     return NULL;
 }
+
diff --git a/src/store/Controlled.h b/src/store/Controlled.h
index e48d94c1ed..651f0e0924 100644
--- a/src/store/Controlled.h
+++ b/src/store/Controlled.h
@@ -39,3 +39,4 @@ public:
 } // namespace Store
 
 #endif /* SQUID_STORE_CONTROLLED_H */
+
diff --git a/src/store/Controller.cc b/src/store/Controller.cc
index 930f6214d2..36758dae10 100644
--- a/src/store/Controller.cc
+++ b/src/store/Controller.cc
@@ -479,7 +479,7 @@ Store::Controller::handleIdleEntry(StoreEntry &e)
 
 void
 Store::Controller::allowCollapsing(StoreEntry *e, const RequestFlags &reqFlags,
-                                 const HttpRequestMethod &reqMethod)
+                                   const HttpRequestMethod &reqMethod)
 {
     e->makePublic(); // this is needed for both local and SMP collapsing
     if (transients)
@@ -569,7 +569,7 @@ Store::Controller::anchorCollapsed(StoreEntry &collapsed, bool &inSync)
 }
 
 namespace Store {
-    static RefCount<Controller> TheRoot;
+static RefCount<Controller> TheRoot;
 }
 
 Store::Controller&
@@ -590,3 +590,4 @@ Store::FreeMemory()
 {
     TheRoot = nullptr;
 }
+
diff --git a/src/store/Controller.h b/src/store/Controller.h
index ff43095de9..6a18ad5c67 100644
--- a/src/store/Controller.h
+++ b/src/store/Controller.h
@@ -109,3 +109,4 @@ extern void FreeMemory();
 } // namespace Store
 
 #endif /* SQUID_STORE_CONTROLLER_H */
+
diff --git a/src/store/Disk.cc b/src/store/Disk.cc
index b745ec64f0..1fcf0e7895 100644
--- a/src/store/Disk.cc
+++ b/src/store/Disk.cc
@@ -393,3 +393,4 @@ Store::Disk::get(const cache_key *)
 {
     return NULL;
 }
+
diff --git a/src/store/Disk.h b/src/store/Disk.h
index 8445418d38..a66946f6ed 100644
--- a/src/store/Disk.h
+++ b/src/store/Disk.h
@@ -12,7 +12,6 @@
 #include "store/Controlled.h"
 #include "StoreIOState.h"
 
-
 class ConfigOption;
 class RemovalPolicy;
 
diff --git a/src/store/Disks.cc b/src/store/Disks.cc
index 340f68ea10..c44ca31b1c 100644
--- a/src/store/Disks.cc
+++ b/src/store/Disks.cc
@@ -403,13 +403,13 @@ Store::Disks::sync()
         store(i)->sync();
 }
 
-void 
+void
 Store::Disks::markForUnlink(StoreEntry &e) {
     if (e.swap_filen >= 0)
         store(e.swap_dirn)->markForUnlink(e);
 }
 
-void 
+void
 Store::Disks::unlink(StoreEntry &e) {
     if (e.swap_filen >= 0)
         store(e.swap_dirn)->unlink(e);
@@ -445,10 +445,9 @@ bool
 Store::Disks::updateCollapsed(StoreEntry &collapsed)
 {
     return collapsed.swap_filen >= 0 &&
-        dir(collapsed.swap_dirn).updateCollapsed(collapsed);
+           dir(collapsed.swap_dirn).updateCollapsed(collapsed);
 }
 
-
 /* Store::Disks globals that should be converted to use RegisteredRunner */
 
 void
@@ -637,3 +636,4 @@ storeDirSwapLog(const StoreEntry * e, int op)
 
     dynamic_cast<SwapDir *>(INDEXSD(e->swap_dirn))->logEntry(*e, op);
 }
+
diff --git a/src/store/Disks.h b/src/store/Disks.h
index c557d8d667..9f7be036e1 100644
--- a/src/store/Disks.h
+++ b/src/store/Disks.h
@@ -64,3 +64,4 @@ extern STDIRSELECT *storeDirSelectSwapDir;
 void storeDirSwapLog(const StoreEntry *e, int op);
 
 #endif /* SQUID_STORE_DISKS_H */
+
diff --git a/src/store/LocalSearch.cc b/src/store/LocalSearch.cc
index 8a71e1bf7e..eecf2ac546 100644
--- a/src/store/LocalSearch.cc
+++ b/src/store/LocalSearch.cc
@@ -118,3 +118,4 @@ Store::LocalSearch::copyBucket()
     ++bucket;
     debugs(47,3, "got entries: " << entries.size());
 }
+
diff --git a/src/store/LocalSearch.h b/src/store/LocalSearch.h
index fd0977abec..df85c6f50e 100644
--- a/src/store/LocalSearch.h
+++ b/src/store/LocalSearch.h
@@ -12,7 +12,8 @@
 #include "store/forward.h"
 
 namespace Store {
-    StoreSearch *NewLocalSearch();
+StoreSearch *NewLocalSearch();
 } // namespace Store
 
 #endif /* SQUID_STORE_LOCAL_SEARCH_H */
+
diff --git a/src/store/forward.h b/src/store/forward.h
index 0bace2fa6a..1fa913c8bc 100644
--- a/src/store/forward.h
+++ b/src/store/forward.h
@@ -26,16 +26,16 @@ class Transients;
 
 namespace Store
 {
-    class Storage;
-    class Controller;
-    class Controlled;
-    class Disks;
-    class Disk;
-    class DiskConfig;
-
-    typedef ::StoreEntry Entry;
-    typedef ::MemStore Memory;
-    typedef ::Transients Transients;
+class Storage;
+class Controller;
+class Controlled;
+class Disks;
+class Disk;
+class DiskConfig;
+
+typedef ::StoreEntry Entry;
+typedef ::MemStore Memory;
+typedef ::Transients Transients;
 } // namespace Store
 
 // TODO: Remove these once all code has been transitioned to Store namespace.
diff --git a/src/tests/TestSwapDir.cc b/src/tests/TestSwapDir.cc
index 5f92009311..23776cb619 100644
--- a/src/tests/TestSwapDir.cc
+++ b/src/tests/TestSwapDir.cc
@@ -69,3 +69,4 @@ TestSwapDir::openStoreIO(StoreEntry &, StoreIOState::STFNCB *, StoreIOState::STI
 void
 TestSwapDir::parse(int, char*)
 {}
+