[Box Backup-dev] COMMIT r356 - in box/trunk: lib/backupclient lib/crypto test/backupdiff

[boxbackup-dev at fluffy.co.uk]

Author: ben
Date: 2006-02-01 19:50:54 +0000 (Wed, 01 Feb 2006)
New Revision: 356

Modified:
   box/trunk/lib/backupclient/BackupStoreDirectory.cpp
   box/trunk/lib/backupclient/BackupStoreFile.cpp
   box/trunk/lib/backupclient/BackupStoreFile.h
   box/trunk/lib/backupclient/BackupStoreFileDiff.cpp
   box/trunk/lib/crypto/Random.cpp
   box/trunk/test/backupdiff/testbackupdiff.cpp
Log:
Get rid of the non-test compiler warnings seen on Darwin with gcc4

Modified: box/trunk/lib/backupclient/BackupStoreDirectory.cpp
===================================================================
--- box/trunk/lib/backupclient/BackupStoreDirectory.cpp	2006-02-01 11:05:22 UTC (rev 355)
+++ box/trunk/lib/backupclient/BackupStoreDirectory.cpp	2006-02-01 19:50:54 UTC (rev 356)
@@ -36,7 +36,7 @@
 	// Then a StreamableMemBlock for attributes
 } dir_StreamFormat;
 
-enum
+typedef enum
 {
 	Option_DependencyInfoPresent = 1
 } dir_StreamFormatOptions;

Modified: box/trunk/lib/backupclient/BackupStoreFile.cpp
===================================================================
--- box/trunk/lib/backupclient/BackupStoreFile.cpp	2006-02-01 11:05:22 UTC (rev 355)
+++ box/trunk/lib/backupclient/BackupStoreFile.cpp	2006-02-01 19:50:54 UTC (rev 356)
@@ -1499,3 +1499,27 @@
 }
 
 
+// --------------------------------------------------------------------------
+//
+// Function
+//		Name:    DiffTimer::DiffTimer();
+//		Purpose: Constructor
+//		Created: 2005/02/01
+//
+// --------------------------------------------------------------------------
+DiffTimer::DiffTimer()
+{
+}
+
+
+// --------------------------------------------------------------------------
+//
+// Function
+//		Name:    DiffTimer::DiffTimer();
+//		Purpose: Destructor
+//		Created: 2005/02/01
+//
+// --------------------------------------------------------------------------
+DiffTimer::~DiffTimer()
+{	
+}

Modified: box/trunk/lib/backupclient/BackupStoreFile.h
===================================================================
--- box/trunk/lib/backupclient/BackupStoreFile.h	2006-02-01 11:05:22 UTC (rev 355)
+++ box/trunk/lib/backupclient/BackupStoreFile.h	2006-02-01 19:50:54 UTC (rev 356)
@@ -47,6 +47,9 @@
 class DiffTimer
 {
 public:
+	DiffTimer();
+	virtual ~DiffTimer();
+public:
 	virtual void   DoKeepAlive() = 0;
 	virtual time_t GetTimeMgmtEpoch() = 0;
 	virtual int    GetMaximumDiffingTime() = 0;

Modified: box/trunk/lib/backupclient/BackupStoreFileDiff.cpp
===================================================================
--- box/trunk/lib/backupclient/BackupStoreFileDiff.cpp	2006-02-01 11:05:22 UTC (rev 355)
+++ box/trunk/lib/backupclient/BackupStoreFileDiff.cpp	2006-02-01 19:50:54 UTC (rev 356)
@@ -835,7 +835,9 @@
 	ASSERT(pFirstInHashList != 0);
 	ASSERT(pIndex != 0);
 
-	uint16_t Hash = fastSum.GetComponentForHashing();
+#ifndef NDEBUG
+	uint16_t DEBUG_Hash = fastSum.GetComponentForHashing();
+#endif
 	uint32_t Checksum = fastSum.GetChecksum();
 
 	// Before we go to the expense of the MD5, make sure it's a darn good match on the checksum we already know.
@@ -873,7 +875,7 @@
 	{
 		//TRACE3("scan size %d, block size %d, hash %d\n", scan->mSize, BlockSize, Hash);
 		ASSERT(scan->mSize == BlockSize);
-		ASSERT(RollingChecksum::ExtractHashingComponent(scan->mWeakChecksum) == Hash);
+		ASSERT(RollingChecksum::ExtractHashingComponent(scan->mWeakChecksum) == DEBUG_Hash);
 	
 		// Compare?
 		if(strong.DigestMatches(scan->mStrongChecksum))

Modified: box/trunk/lib/crypto/Random.cpp
===================================================================
--- box/trunk/lib/crypto/Random.cpp	2006-02-01 11:05:22 UTC (rev 355)
+++ box/trunk/lib/crypto/Random.cpp	2006-02-01 19:50:54 UTC (rev 356)
@@ -69,7 +69,7 @@
 std::string Random::GenerateHex(int Length)
 {
 	uint8_t r[256];
-	if(Length > sizeof(r))
+	if(Length > (int)sizeof(r))
 	{
 		THROW_EXCEPTION(CipherException, LengthRequestedTooLongForRandomHex)
 	}

Modified: box/trunk/test/backupdiff/testbackupdiff.cpp
===================================================================
--- box/trunk/test/backupdiff/testbackupdiff.cpp	2006-02-01 11:05:22 UTC (rev 355)
+++ box/trunk/test/backupdiff/testbackupdiff.cpp	2006-02-01 19:50:54 UTC (rev 356)
@@ -83,7 +83,7 @@
 	fclose(f);
 	free(b);
 
-	TEST_THAT(TestGetFileSize(filename) == size);
+	TEST_THAT((size_t)TestGetFileSize(filename) == size);
 }