[Box Backup-dev] COMMIT r882 - box/chris/merge/lib/backupstore

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-08-31 23:22:35 +0100 (Thu, 31 Aug 2006)
New Revision: 882

Modified:
   box/chris/merge/lib/backupstore/BackupStoreCheck.cpp
Log:
Revert to trunk


Modified: box/chris/merge/lib/backupstore/BackupStoreCheck.cpp
===================================================================
--- box/chris/merge/lib/backupstore/BackupStoreCheck.cpp	2006-08-31 22:20:45 UTC (rev 881)
+++ box/chris/merge/lib/backupstore/BackupStoreCheck.cpp	2006-08-31 22:22:35 UTC (rev 882)
@@ -328,8 +328,7 @@
 	std::string dirName;
 	StoreStructure::MakeObjectFilename(StartID, mStoreRoot, mDiscSetNumber, dirName, false /* don't make sure the dir exists */);
 	// Check expectations
-	ASSERT(dirName.size() > 4 && 
-		dirName[dirName.size() - 4] == DIRECTORY_SEPARATOR_ASCHAR);
+	ASSERT(dirName.size() > 4 && dirName[dirName.size() - 4] == '/');
 	// Remove the filename from it
 	dirName.resize(dirName.size() - 4); // four chars for "/o00"
 	
@@ -378,9 +377,7 @@
 		if(!fileOK)
 		{
 			// Unexpected or bad file, delete it
-			::printf("Spurious file %s" DIRECTORY_SEPARATOR "%s "
-				"found%s\n", dirName.c_str(), (*i).c_str(), 
-				mFixErrors?", deleting":"");
+			::printf("Spurious file %s/%s found%s\n", dirName.c_str(), (*i).c_str(), mFixErrors?", deleting":"");
 			++mNumberErrorsFound;
 			if(mFixErrors)
 			{
@@ -469,11 +466,10 @@
 		}
 		
 		// Add to usage counts
-		int64_t s = file->GetDiscUsageInBlocks();
-		mBlocksUsed += s;
+		mBlocksUsed += size;
 		if(!isFile)
 		{
-			mBlocksInDirectories += s;
+			mBlocksInDirectories += size;
 		}
 	}
 	catch(...)