summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2007-07-26 22:02:54 +0000
committerChris Wilson <chris+github@qwirx.com>2007-07-26 22:02:54 +0000
commit8894c945eb3c5acebd64bb1e71514484246dc596 (patch)
tree93513f4549ad83ac7db5714640e73d4b3a07a81e
parent1e57cefbd35bb58f221fcd291b4038b22e95e186 (diff)
Undo bad merge of [1658] and [1669] (refs #3, merges [1671])
-rw-r--r--bin/bbackupd/BackupDaemon.cpp47
1 files changed, 3 insertions, 44 deletions
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)
{
@@ -2831,46 +2830,6 @@ bool BackupDaemon::DeserializeStoreObjectInfo(int64_t & aClientStoreMarker, box_
//
//
//
- 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 << ")");