import version 0.11rc1

This commit has been made by 'bzr import'. I used the upstream tarball
of Version 0.11rc1 for creating it. It has the md5sum:

75608d8bb72dff9a556850ccd0ae8cb9

1 files changed, 16 insertions, 12 deletions

diff --git a/lib/backupstore/BackupStoreCheck2.cpp b/lib/backupstore/BackupStoreCheck2.cpp
index 38e8bf92..e251799f 100644
--- a/lib/backupstore/BackupStoreCheck2.cpp
+++ b/lib/backupstore/BackupStoreCheck2.cpp
@@ -1,4 +1,4 @@
-// distribution boxbackup-0.10 (svn version: 494)
+// distribution boxbackup-0.11rc1 (svn version: 2023_2024)
 //  
 // Copyright (c) 2003 - 2006
 //      Ben Summers and contributors.  All rights reserved.
@@ -85,7 +85,7 @@ void BackupStoreCheck::CheckRoot()
 	}
 	else
 	{
-		::printf("Root directory doesn't exist\n");
+		BOX_WARNING("Root directory doesn't exist");
 		
 		++mNumberErrorsFound;
 		
@@ -156,7 +156,7 @@ void BackupStoreCheck::CheckUnattachedObjects()
 			if((flags & Flags_IsContained) == 0)
 			{
 				// Unattached object...
-				::printf("Object %llx is unattached.\n", pblock->mID[e]);
+				BOX_WARNING("Object " << BOX_FORMAT_OBJECTID(pblock->mID[e]) << " is unattached.");
 				++mNumberErrorsFound;
 
 				// What's to be done?
@@ -185,7 +185,7 @@ void BackupStoreCheck::CheckUnattachedObjects()
 						// Just delete it to be safe.
 						if(diffFromObjectID != 0)
 						{
-							::printf("Object %llx is unattached, and is a patch. Deleting, cannot reliably recover.\n", pblock->mID[e]);
+							BOX_WARNING("Object " << BOX_FORMAT_OBJECTID(pblock->mID[e]) << " is unattached, and is a patch. Deleting, cannot reliably recover.");
 						
 							// Delete this object instead
 							if(mFixErrors)
@@ -267,11 +267,15 @@ bool BackupStoreCheck::TryToRecreateDirectory(int64_t MissingDirectoryID)
 	// Can recreate this! Wooo!
 	if(!mFixErrors)
 	{
-		::printf("Missing directory %llx could be recreated\n", MissingDirectoryID);
+		BOX_WARNING("Missing directory " << 
+			BOX_FORMAT_OBJECTID(MissingDirectoryID) <<
+			" could be recreated.");
 		mDirsAdded.insert(MissingDirectoryID);
 		return true;
 	}
-	::printf("Recreating missing directory %llx\n", MissingDirectoryID);
+
+	BOX_WARNING("Recreating missing directory " << 
+		BOX_FORMAT_OBJECTID(MissingDirectoryID));
 	
 	// Create a blank directory
 	BackupStoreDirectory dir(MissingDirectoryID, missing->second /* containing dir ID */);
@@ -338,7 +342,7 @@ int64_t BackupStoreCheck::GetLostAndFoundDirID()
 		if(!dir.NameInUse(lostAndFound))
 		{
 			// Found a name which can be used
-			::printf("Lost and found dir has name %s\n", name);
+			BOX_WARNING("Lost and found dir has name " << name);
 			break;
 		}
 	}
@@ -562,7 +566,7 @@ void BackupStoreCheck::WriteNewStoreInfo()
 	}
 	catch(...)
 	{
-		::printf("Load of existing store info failed, regenerating.\n");
+		BOX_WARNING("Load of existing store info failed, regenerating.");
 		++mNumberErrorsFound;
 	}
 
@@ -589,7 +593,7 @@ void BackupStoreCheck::WriteNewStoreInfo()
 	}
 	else
 	{
-		::printf("NOTE: Soft limit for account changed to ensure housekeeping doesn't delete files on next run\n");
+		BOX_WARNING("Soft limit for account changed to ensure housekeeping doesn't delete files on next run.");
 	}
 	if(poldInfo.get() != 0 && poldInfo->GetBlocksHardLimit() > minHard)
 	{
@@ -597,7 +601,7 @@ void BackupStoreCheck::WriteNewStoreInfo()
 	}
 	else
 	{
-		::printf("NOTE: Hard limit for account changed to ensure housekeeping doesn't delete files on next run\n");
+		BOX_WARNING("Hard limit for account changed to ensure housekeeping doesn't delete files on next run.");
 	}
 	
 	// Object ID
@@ -624,7 +628,7 @@ void BackupStoreCheck::WriteNewStoreInfo()
 	if(mFixErrors)
 	{
 		info->Save();
-		::printf("New store info file written successfully.\n");
+		BOX_NOTICE("New store info file written successfully.");
 	}
 }
 
@@ -691,7 +695,7 @@ bool BackupStoreDirectory::CheckAndFix()
 			if(dependsOlder != 0 && FindEntryByID(dependsOlder) == 0)
 			{
 				// Has an older version marked, but this doesn't exist. Remove this mark
-				TRACE2("Entry id %llx was marked that %llx depended on it, which doesn't exist, dependency info cleaered\n", (*i)->GetObjectID(), dependsOlder);
+				TRACE2("Entry id %llx was marked that %llx depended on it, which doesn't exist, dependency info cleared\n", (*i)->GetObjectID(), dependsOlder);
 
 				(*i)->SetDependsOlder(0);