[Box Backup-dev] COMMIT r606 - box/chris/general/lib/backupstore

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2006-05-30 19:26:11 +0000 (Tue, 30 May 2006)
New Revision: 606

Modified:
   box/chris/general/lib/backupstore/BackupStoreCheck.cpp
Log:
* BackupStoreCheck.cpp
- Fixed use of wrong directory separators on Win32


Modified: box/chris/general/lib/backupstore/BackupStoreCheck.cpp
===================================================================
--- box/chris/general/lib/backupstore/BackupStoreCheck.cpp	2006-05-30 19:25:31 UTC (rev 605)
+++ box/chris/general/lib/backupstore/BackupStoreCheck.cpp	2006-05-30 19:26:11 UTC (rev 606)
@@ -328,7 +328,8 @@
 	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] == '/');
+	ASSERT(dirName.size() > 4 && 
+		dirName[dirName.size() - 4] == DIRECTORY_SEPARATOR_ASCHAR);
 	// Remove the filename from it
 	dirName.resize(dirName.size() - 4); // four chars for "/o00"
 	
@@ -377,7 +378,9 @@
 		if(!fileOK)
 		{
 			// Unexpected or bad file, delete it
-			::printf("Spurious file %s/%s found%s\n", dirName.c_str(), (*i).c_str(), mFixErrors?", deleting":"");
+			::printf("Spurious file %s" DIRECTORY_SEPARATOR "%s "
+				"found%s\n", dirName.c_str(), (*i).c_str(), 
+				mFixErrors?", deleting":"");
 			++mNumberErrorsFound;
 			if(mFixErrors)
 			{