[Box Backup-commit] COMMIT r1765 - box/chris/merge/bin/bbackupd

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2007-07-26 23:02:54 +0100 (Thu, 26 Jul 2007)
New Revision: 1765

Modified:
   box/chris/merge/bin/bbackupd/BackupDaemon.cpp
Log:
Undo bad merge of [1658] and [1669] (refs #3, merges [1671])


Modified: box/chris/merge/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/chris/merge/bin/bbackupd/BackupDaemon.cpp	2007-07-26 22:02:26 UTC (rev 1764)
+++ box/chris/merge/bin/bbackupd/BackupDaemon.cpp	2007-07-26 22:02:54 UTC (rev 1765)
@@ -2611,7 +2611,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
 {
@@ -2671,9 +2671,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)
 	{
@@ -2831,46 +2830,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 << ")");