[Box Backup-commit] COMMIT r1471 - in box/chris/merge/lib: backupclient server

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2007-03-24 22:56:13 +0000 (Sat, 24 Mar 2007)
New Revision: 1471

Modified:
   box/chris/merge/lib/backupclient/BackupStoreFile.cpp
   box/chris/merge/lib/backupclient/BackupStoreFilenameClear.cpp
   box/chris/merge/lib/server/Protocol.cpp
Log:
Use logging framework to reduce noise for those who don't want it
(refs #3, merges [1439] [1440] [1443])


Modified: box/chris/merge/lib/backupclient/BackupStoreFile.cpp
===================================================================
--- box/chris/merge/lib/backupclient/BackupStoreFile.cpp	2007-03-24 22:54:30 UTC (rev 1470)
+++ box/chris/merge/lib/backupclient/BackupStoreFile.cpp	2007-03-24 22:56:13 UTC (rev 1471)
@@ -46,6 +46,7 @@
 #include "ReadGatherStream.h"
 #include "Random.h"
 #include "BackupStoreFileEncodeStream.h"
+#include "Logging.h"
 
 #include "MemLeakFindOn.h"
 
@@ -1485,9 +1486,8 @@
 // --------------------------------------------------------------------------
 void BackupStoreFile::EncodingBuffer::Reallocate(int NewSize)
 {
-#ifndef WIN32
-	TRACE2("Reallocating EncodingBuffer from %d to %d\n", mBufferSize, NewSize);
-#endif
+	BOX_TRACE("Reallocating EncodingBuffer from " << mBufferSize <<
+		" to " << NewSize);
 	ASSERT(mpBuffer != 0);
 	uint8_t *buffer = (uint8_t*)BackupStoreFile::CodingChunkAlloc(NewSize);
 	if(buffer == 0)

Modified: box/chris/merge/lib/backupclient/BackupStoreFilenameClear.cpp
===================================================================
--- box/chris/merge/lib/backupclient/BackupStoreFilenameClear.cpp	2007-03-24 22:54:30 UTC (rev 1470)
+++ box/chris/merge/lib/backupclient/BackupStoreFilenameClear.cpp	2007-03-24 22:56:13 UTC (rev 1471)
@@ -13,6 +13,7 @@
 #include "CipherContext.h"
 #include "CipherBlowfish.h"
 #include "Guards.h"
+#include "Logging.h"
 
 #include "MemLeakFindOn.h"
 
@@ -203,9 +204,9 @@
 	{
 		if(sEncDecBufferSize < BufSize)
 		{
-#ifndef WIN32
-			TRACE2("Reallocating filename encoding/decoding buffer from %d to %d\n", sEncDecBufferSize, BufSize);
-#endif
+			BOX_TRACE("Reallocating filename encoding/decoding "
+				"buffer from " << sEncDecBufferSize <<
+				" to " << BufSize);
 			spEncDecBuffer->Resize(BufSize);
 			sEncDecBufferSize = BufSize;
 			MEMLEAKFINDER_NOT_A_LEAK(*spEncDecBuffer);

Modified: box/chris/merge/lib/server/Protocol.cpp
===================================================================
--- box/chris/merge/lib/server/Protocol.cpp	2007-03-24 22:54:30 UTC (rev 1470)
+++ box/chris/merge/lib/server/Protocol.cpp	2007-03-24 22:56:13 UTC (rev 1471)
@@ -22,6 +22,7 @@
 #include "ServerException.h"
 #include "PartialReadStream.h"
 #include "ProtocolUncertainStream.h"
+#include "Logging.h"
 
 #include "MemLeakFindOn.h"
 
@@ -55,7 +56,8 @@
 	  mLastErrorType(NoError),
 	  mLastErrorSubType(NoError)
 {
-	TRACE1("Send block allocation size is %d\n", PROTOCOL_ALLOCATE_SEND_BLOCK_CHUNK);
+	BOX_TRACE("Send block allocation size is " << 
+		PROTOCOL_ALLOCATE_SEND_BLOCK_CHUNK);
 }
 
 // --------------------------------------------------------------------------