SourceFormat Enforcement

[thirdparty/squid.git] / src / fs / Module.cc

diff --git a/src/fs/Module.cc b/src/fs/Module.cc
index 0c7d233ad4a3f4c40fceccce9fd3df24f859b6d0..86191b267a23ec71e9fd8c8a8562770ed11d6b16 100644 (file)
--- a/src/fs/Module.cc
+++ b/src/fs/Module.cc
@@ -2,7 +2,7 @@
 #include "Module.h"
 #if defined(HAVE_FS_UFS) || defined(HAVE_FS_AUFS) || defined(HAVE_FS_DISKD)
 #include "fs/ufs/StoreFSufs.h"
-#include "fs/ufs/ufscommon.h"
+#include "fs/ufs/UFSSwapDir.h"
 #endif
 
 #if HAVE_FS_COSS
@@ -10,24 +10,22 @@
 #endif
 
 #if HAVE_FS_UFS
-static StoreFSufs<UFSSwapDir> *UfsInstance;
+static Fs::Ufs::StoreFSufs<Fs::Ufs::UFSSwapDir> *UfsInstance;
 #endif
 
 #if HAVE_FS_AUFS
-static StoreFSufs<UFSSwapDir> *AufsInstance;
+static Fs::Ufs::StoreFSufs<Fs::Ufs::UFSSwapDir> *AufsInstance;
 #endif
 
-
 #if HAVE_FS_DISKD
-static StoreFSufs<UFSSwapDir> *DiskdInstance;
+static Fs::Ufs::StoreFSufs<Fs::Ufs::UFSSwapDir> *DiskdInstance;
 #endif
 
-#ifdef HAVE_FS_ROCK
+#if HAVE_FS_ROCK
 #include "fs/rock/RockStoreFileSystem.h"
 static Rock::StoreFileSystem *RockInstance = NULL;
 #endif
 
-
 /* TODO: Modify coss code to:
  * (a) remove the StoreFScoss::GetInstance method,
  * (b) declare the StoreFScoss::stats  as static and
@@ -37,30 +35,27 @@ static Rock::StoreFileSystem *RockInstance = NULL;
 StoreFScoss &CossInstance = StoreFScoss::GetInstance();
 #endif
 
-
 void Fs::Init()
 {
 
 #if HAVE_FS_UFS
-    UfsInstance = new StoreFSufs<UFSSwapDir>("Blocking", "ufs");
+    UfsInstance = new Fs::Ufs::StoreFSufs<Fs::Ufs::UFSSwapDir>("Blocking", "ufs");
 #endif
 
 #if HAVE_FS_AUFS
-    AufsInstance = new StoreFSufs<UFSSwapDir>("DiskThreads", "aufs");;
+    AufsInstance = new Fs::Ufs::StoreFSufs<Fs::Ufs::UFSSwapDir>("DiskThreads", "aufs");;
 #endif
 
-
 #if HAVE_FS_DISKD
-    DiskdInstance = new StoreFSufs<UFSSwapDir>("DiskDaemon", "diskd");;
+    DiskdInstance = new Fs::Ufs::StoreFSufs<Fs::Ufs::UFSSwapDir>("DiskDaemon", "diskd");;
 #endif
 
-#ifdef HAVE_FS_ROCK
+#if HAVE_FS_ROCK
     RockInstance = new Rock::StoreFileSystem();
 #endif
 
 }
 
-
 void Fs::Clean()
 {
 #if HAVE_FS_UFS
@@ -71,12 +66,11 @@ void Fs::Clean()
     delete AufsInstance;
 #endif
 
-
 #if HAVE_FS_DISKD
     delete DiskdInstance;
 #endif
 
-#ifdef HAVE_FS_ROCK
+#if HAVE_FS_ROCK
     delete RockInstance;
 #endif