]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
SourceFormat Enforcement
authorAutomatic source maintenance <squidadm@squid-cache.org>
Sat, 11 Aug 2012 00:14:47 +0000 (18:14 -0600)
committerAutomatic source maintenance <squidadm@squid-cache.org>
Sat, 11 Aug 2012 00:14:47 +0000 (18:14 -0600)
src/fs/ufs/RebuildState.cc
src/fs/ufs/StoreSearchUFS.cc
src/fs/ufs/StoreSearchUFS.h
src/fs/ufs/UFSStrategy.cc
src/fs/ufs/UFSSwapDir.cc
src/fs/ufs/UFSSwapLogParser.cc

index 9219dc595bf13ff81b002e958bff6b97155fda46..09ce6ef9fc029e1233de92dcfa05b7c011e82c08 100644 (file)
@@ -40,7 +40,7 @@
 CBDATA_NAMESPACED_CLASS_INIT(Fs::Ufs,RebuildState);
 
 Fs::Ufs::RebuildState::RebuildState(RefCount<UFSSwapDir> aSwapDir) :
-                sd (aSwapDir), LogParser(NULL), e(NULL), fromLog(true), _done (false)
+        sd (aSwapDir), LogParser(NULL), e(NULL), fromLog(true), _done (false)
 {
     /*
      * If the swap.state file exists in the cache_dir, then
index a9ec0bdcdc696745e6453155fed013cb3c6a2140..2b12419621c74115ed037c263ed6dfb1d70d3c79 100644 (file)
@@ -27,7 +27,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- * 
+ *
  */
 
 #include "squid.h"
index c8d5d017ad2e7727f34431022ce6dec9e169eb34..f6848cf35b24c6a1dfc5b9e965dc3978e822a7da 100644 (file)
@@ -24,7 +24,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- * 
+ *
  */
 
 #ifndef SQUID_FS_UFS_STORESEARCHUFS_H
index 78fd0c8898ceb9b6a1c73448248c9522c0852c92..fd3517440ebaadf9784d595739f7a73acd7149cd 100644 (file)
@@ -76,11 +76,11 @@ Fs::Ufs::UFSStrategy::unlinkFile(char const *path)
 
 StoreIOState::Pointer
 Fs::Ufs::UFSStrategy::open(SwapDir * SD, StoreEntry * e, StoreIOState::STFNCB * file_callback,
-                  StoreIOState::STIOCB * aCallback, void *callback_data)
+                           StoreIOState::STIOCB * aCallback, void *callback_data)
 {
     assert (((UFSSwapDir *)SD)->IO == this);
     debugs(79, 3, HERE << "fileno "<< std::setfill('0') << std::hex
-            << std::uppercase << std::setw(8) << e->swap_filen);
+           << std::uppercase << std::setw(8) << e->swap_filen);
 
     /* to consider: make createstate a private UFSStrategy call */
     StoreIOState::Pointer sio = createState (SD, e, aCallback, callback_data);
@@ -112,13 +112,13 @@ Fs::Ufs::UFSStrategy::open(SwapDir * SD, StoreEntry * e, StoreIOState::STFNCB *
 
 StoreIOState::Pointer
 Fs::Ufs::UFSStrategy::create(SwapDir * SD, StoreEntry * e, StoreIOState::STFNCB * file_callback,
-                    StoreIOState::STIOCB * aCallback, void *callback_data)
+                             StoreIOState::STIOCB * aCallback, void *callback_data)
 {
     assert (((UFSSwapDir *)SD)->IO == this);
     /* Allocate a number */
     sfileno filn = ((UFSSwapDir *)SD)->mapBitAllocate();
     debugs(79, 3, HERE << "fileno "<< std::setfill('0') <<
-            std::hex << std::uppercase << std::setw(8) << filn);
+           std::hex << std::uppercase << std::setw(8) << filn);
 
     /* Shouldn't we handle a 'bitmap full' error here? */
 
index c4bfba5a0326c306a43d34ec569312fc8b3e0d28..a8ea3fa8df7af26eb2fbe915369f9af63d54ffc7 100644 (file)
@@ -74,8 +74,8 @@ public:
 };
 
 UFSCleanLog::UFSCleanLog(SwapDir *aSwapDir) :
-                cur(NULL), newLog(NULL), cln(NULL), outbuf(NULL),
-                outbuf_offset(0), fd(-1),walker(NULL), sd(aSwapDir)
+        cur(NULL), newLog(NULL), cln(NULL), outbuf(NULL),
+        outbuf_offset(0), fd(-1),walker(NULL), sd(aSwapDir)
 {}
 
 const StoreEntry *
@@ -361,7 +361,7 @@ Fs::Ufs::UFSSwapDir::doubleCheck(StoreEntry & e)
 
     if ((off_t)e.swap_file_sz != sb.st_size) {
         debugs(47, DBG_CRITICAL, HERE << "WARNING: Size Mismatch. Entry size: "
-                << e.swap_file_sz << ", file size: " << sb.st_size);
+               << e.swap_file_sz << ", file size: " << sb.st_size);
         dumpEntry(e);
         return true;
     }
@@ -471,7 +471,7 @@ void
 Fs::Ufs::UFSSwapDir::reference(StoreEntry &e)
 {
     debugs(47, 3, HERE << "referencing " << &e << " " <<
-            e.swap_dirn << "/" << e.swap_filen);
+           e.swap_dirn << "/" << e.swap_filen);
 
     if (repl->Referenced)
         repl->Referenced(repl, &e, &e.repl);
@@ -481,7 +481,7 @@ bool
 Fs::Ufs::UFSSwapDir::dereference(StoreEntry & e)
 {
     debugs(47, 3, HERE << "dereferencing " << &e << " " <<
-            e.swap_dirn << "/" << e.swap_filen);
+           e.swap_dirn << "/" << e.swap_filen);
 
     if (repl->Dereferenced)
         repl->Dereferenced(repl, &e, &e.repl);
@@ -731,15 +731,15 @@ Fs::Ufs::UFSSwapDir::validL2(int anInt) const
 
 StoreEntry *
 Fs::Ufs::UFSSwapDir::addDiskRestore(const cache_key * key,
-                           sfileno file_number,
-                           uint64_t swap_file_sz,
-                           time_t expires,
-                           time_t timestamp,
-                           time_t lastref,
-                           time_t lastmod,
-                           uint32_t refcount,
-                           uint16_t newFlags,
-                           int clean)
+                                    sfileno file_number,
+                                    uint64_t swap_file_sz,
+                                    time_t expires,
+                                    time_t timestamp,
+                                    time_t lastref,
+                                    time_t lastmod,
+                                    uint32_t refcount,
+                                    uint16_t newFlags,
+                                    int clean)
 {
     StoreEntry *e = NULL;
     debugs(47, 5, HERE << storeKeyText(key)  <<
index 619e2ffbec664ee2876e0c5283abb793d270e3a7..d25ab7913e416bc522b51acb158daf46136e5d84 100644 (file)
@@ -24,7 +24,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- * 
+ *
  */
 
 #include "squid.h"