------------------------------------------------------------ revno: 12274 revision-id: squidadm@squid-cache.org-20120811001447-g831muec4n0mh2qx parent: squid3@treenet.co.nz-20120810080943-5i6os9hpcjv2ifea committer: Automatic source maintenance branch nick: trunk timestamp: Fri 2012-08-10 18:14:47 -0600 message: SourceFormat Enforcement ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20120811001447-\ # g831muec4n0mh2qx # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: 36c867690fb42d478e14bf34dfb6011ebccaf3ce # timestamp: 2012-08-11 00:52:45 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20120810080943-\ # 5i6os9hpcjv2ifea # # Begin patch === modified file 'src/fs/ufs/RebuildState.cc' --- src/fs/ufs/RebuildState.cc 2012-08-10 06:56:49 +0000 +++ src/fs/ufs/RebuildState.cc 2012-08-11 00:14:47 +0000 @@ -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 === modified file 'src/fs/ufs/StoreSearchUFS.cc' --- src/fs/ufs/StoreSearchUFS.cc 2012-08-10 06:56:49 +0000 +++ src/fs/ufs/StoreSearchUFS.cc 2012-08-11 00:14:47 +0000 @@ -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" === modified file 'src/fs/ufs/StoreSearchUFS.h' --- src/fs/ufs/StoreSearchUFS.h 2012-08-10 06:56:49 +0000 +++ src/fs/ufs/StoreSearchUFS.h 2012-08-11 00:14:47 +0000 @@ -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 === modified file 'src/fs/ufs/UFSStrategy.cc' --- src/fs/ufs/UFSStrategy.cc 2012-08-10 06:56:49 +0000 +++ src/fs/ufs/UFSStrategy.cc 2012-08-11 00:14:47 +0000 @@ -76,11 +76,11 @@ 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 @@ 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? */ === modified file 'src/fs/ufs/UFSSwapDir.cc' --- src/fs/ufs/UFSSwapDir.cc 2012-08-10 06:56:49 +0000 +++ src/fs/ufs/UFSSwapDir.cc 2012-08-11 00:14:47 +0000 @@ -74,8 +74,8 @@ }; 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 @@ 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 @@ 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 @@ 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 @@ 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) << === modified file 'src/fs/ufs/UFSSwapLogParser.cc' --- src/fs/ufs/UFSSwapLogParser.cc 2012-08-10 06:56:49 +0000 +++ src/fs/ufs/UFSSwapLogParser.cc 2012-08-11 00:14:47 +0000 @@ -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"