From: Automatic source maintenance Date: Sat, 11 Aug 2012 00:14:47 +0000 (-0600) Subject: SourceFormat Enforcement X-Git-Tag: sourceformat-review-1~118 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=187642d03da466c2a804071eefb3faaf0010203b;p=thirdparty%2Fsquid.git SourceFormat Enforcement --- diff --git a/src/fs/ufs/RebuildState.cc b/src/fs/ufs/RebuildState.cc index 9219dc595b..09ce6ef9fc 100644 --- a/src/fs/ufs/RebuildState.cc +++ b/src/fs/ufs/RebuildState.cc @@ -40,7 +40,7 @@ CBDATA_NAMESPACED_CLASS_INIT(Fs::Ufs,RebuildState); Fs::Ufs::RebuildState::RebuildState(RefCount 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 diff --git a/src/fs/ufs/StoreSearchUFS.cc b/src/fs/ufs/StoreSearchUFS.cc index a9ec0bdcdc..2b12419621 100644 --- a/src/fs/ufs/StoreSearchUFS.cc +++ b/src/fs/ufs/StoreSearchUFS.cc @@ -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" diff --git a/src/fs/ufs/StoreSearchUFS.h b/src/fs/ufs/StoreSearchUFS.h index c8d5d017ad..f6848cf35b 100644 --- a/src/fs/ufs/StoreSearchUFS.h +++ b/src/fs/ufs/StoreSearchUFS.h @@ -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 diff --git a/src/fs/ufs/UFSStrategy.cc b/src/fs/ufs/UFSStrategy.cc index 78fd0c8898..fd3517440e 100644 --- a/src/fs/ufs/UFSStrategy.cc +++ b/src/fs/ufs/UFSStrategy.cc @@ -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? */ diff --git a/src/fs/ufs/UFSSwapDir.cc b/src/fs/ufs/UFSSwapDir.cc index c4bfba5a03..a8ea3fa8df 100644 --- a/src/fs/ufs/UFSSwapDir.cc +++ b/src/fs/ufs/UFSSwapDir.cc @@ -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) << diff --git a/src/fs/ufs/UFSSwapLogParser.cc b/src/fs/ufs/UFSSwapLogParser.cc index 619e2ffbec..d25ab7913e 100644 --- a/src/fs/ufs/UFSSwapLogParser.cc +++ b/src/fs/ufs/UFSSwapLogParser.cc @@ -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"