From 8894c945eb3c5acebd64bb1e71514484246dc596 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris+github@qwirx.com>
Date: Thu, 26 Jul 2007 22:02:54 +0000
Subject: Undo bad merge of [1658] and [1669] (refs #3, merges [1671])

---
 bin/bbackupd/BackupDaemon.cpp | 47 +++----------------------------------------
 1 file changed, 3 insertions(+), 44 deletions(-)

(limited to 'bin')

diff --git a/bin/bbackupd/BackupDaemon.cpp b/bin/bbackupd/BackupDaemon.cpp
index a772d8de..4e5621a4 100644
--- a/bin/bbackupd/BackupDaemon.cpp
+++ b/bin/bbackupd/BackupDaemon.cpp
@@ -2611,7 +2611,7 @@ BackupDaemon::CommandSocketInfo::~CommandSocketInfo()
 
 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 @@ bool BackupDaemon::SerializeStoreObjectInfo(int64_t aClientStoreMarker, box_time
 		//
 		//
 		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)
 	{
@@ -2828,46 +2827,6 @@ bool BackupDaemon::DeserializeStoreObjectInfo(int64_t & aClientStoreMarker, box_
 			mIDMapMounts.push_back(strItem);
 		}
 
-		//
-		//
-		//
-		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);
-
 		//
 		//
 		//
-- 
cgit v1.2.3