[Box Backup-commit] COMMIT r1671 - box/chris/general/bin/bbackupd

boxbackup-dev at fluffy.co.uk boxbackup-dev at fluffy.co.uk
Fri May 18 21:13:55 BST 2007


Author: chris
Date: 2007-05-18 21:13:55 +0100 (Fri, 18 May 2007)
New Revision: 1671

Modified:
   box/chris/general/bin/bbackupd/BackupDaemon.cpp
Log:
Undo bad merge of [1658] and [1669]


Modified: box/chris/general/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/chris/general/bin/bbackupd/BackupDaemon.cpp	2007-05-17 19:53:43 UTC (rev 1670)
+++ box/chris/general/bin/bbackupd/BackupDaemon.cpp	2007-05-18 20:13:55 UTC (rev 1671)
@@ -2558,7 +2558,7 @@
 
 static const int STOREOBJECTINFO_MAGIC_ID_VALUE = 0x7777525F;
 static const std::string STOREOBJECTINFO_MAGIC_ID_STRING = "BBACKUPD-STATE";
-static const int STOREOBJECTINFO_VERSION = 2;
+static const int STOREOBJECTINFO_VERSION = 1;
 
 bool BackupDaemon::SerializeStoreObjectInfo(int64_t aClientStoreMarker, box_time_t theLastSyncTime, box_time_t theNextSyncTime) const
 {
@@ -2618,9 +2618,8 @@
 		//
 		//
 		aFile.Close();
-		BOX_INFO("Saved store object info file: " <<
-			StoreObjectInfoFile << ", version " <<
-			STOREOBJECTINFO_VERSION);
+		BOX_INFO("Saved store object info file: "
+			<< StoreObjectInfoFile);
 	}
 	catch(std::exception &e)
 	{
@@ -2778,46 +2777,6 @@
 		//
 		//
 		//
-		iCount = 0;
-		anArchive.Read(iCount);
-
-		for(int v = 0; v < iCount; v++)
-		{
-			int64_t anId;
-			anArchive.Read(anId);
-
-			std::string aName;
-			anArchive.Read(aName);
-
-			mUnusedRootDirEntries.push_back(std::pair<int64_t, std::string>(anId, aName));
-		}
-
-		if (iCount > 0)
-			anArchive.Read(mDeleteUnusedRootDirEntriesAfter);
-
-		//
-		//
-		//
-		iCount = 0;
-		anArchive.Read(iCount);
-
-		for(int v = 0; v < iCount; v++)
-		{
-			int64_t anId;
-			anArchive.Read(anId);
-
-			std::string aName;
-			anArchive.Read(aName);
-
-			mUnusedRootDirEntries.push_back(std::pair<int64_t, std::string>(anId, aName));
-		}
-
-		if (iCount > 0)
-			anArchive.Read(mDeleteUnusedRootDirEntriesAfter);
-
-		//
-		//
-		//
 		aFile.Close();
 		BOX_INFO("Loaded store object info file version " << iVersion
 			<< "(" << StoreObjectInfoFile << ")");




More information about the Boxbackup-commit mailing list