Refactor ClientStoreMarker::NotKnown out of BackupClientContext.h

boxbackup · Dec 8, 2018 · 4c55b10 · 4c55b10
1 parent a977554
commit 4c55b10
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/lib/backupstore/BackupCommands.cpp b/lib/backupstore/BackupCommands.cpp
@@ -226,7 +226,7 @@ std::auto_ptr<BackupProtocolMessage> BackupProtocolFinished2::DoCommand(
 		rContext.GetConnectionDetails());
 
 	// We can only get the current marker if we have a lock. Otherwise it doesn't make sense.
-	int64_t marker = BackupFileSystem::ClientStoreMarker_NotKnown;
+	int64_t marker = ClientStoreMarker::NotKnown;
 	if(!rContext.SessionIsReadOnly())
 	{
 		marker = rContext.GetClientStoreMarker();

diff --git a/lib/backupstore/BackupConstants.h b/lib/backupstore/BackupConstants.h
@@ -26,5 +26,14 @@
 		BackupProtocolError::ErrorType, \
 		BackupProtocolError::code));
 
+namespace ClientStoreMarker
+{
+	enum
+	{
+		NotKnown = -1,
+		Default = 0,
+	};
+};
+
 #endif // BACKUPCONSTANTS__H
 
diff --git a/lib/bbackupd/BackupClientContext.cpp b/lib/bbackupd/BackupClientContext.cpp
@@ -17,6 +17,7 @@
 	#include <sys/time.h>
 #endif
 
+#include "BackupConstants.h"
 #include "BoxPortsAndFiles.h"
 #include "BoxTime.h"
 #include "BackupClientContext.h"
@@ -49,7 +50,7 @@ BackupClientContext::BackupClientContext
 : mrConfig(rConfig),
   mrResolver(rResolver),
   mrProgressNotifier(rProgressNotifier),
-  mClientStoreMarker(ClientStoreMarker_NotKnown),
+  mClientStoreMarker(ClientStoreMarker::NotKnown),
   mpDeleteList(NULL),
   mpCurrentIDMap(NULL),
   mpNewIDMap(NULL),
@@ -129,7 +130,7 @@ BackupProtocolCallable &BackupClientContext::GetConnection()
 		BackupProtocolLoginConfirmed& login_conf(mapConnection->GetLoginConfirmed());
 
 		// If reconnecting, check that the client store marker is the one we expect:
-		if(mClientStoreMarker != ClientStoreMarker_NotKnown)
+		if(mClientStoreMarker != ClientStoreMarker::NotKnown)
 		{
 			if(login_conf.GetClientStoreMarker() != mClientStoreMarker)
 			{
@@ -152,7 +153,7 @@ BackupProtocolCallable &BackupClientContext::GetConnection()
 					"same account?");
 			}
 		}
-		else // mClientStoreMarker == ClientStoreMarker_NotKnown
+		else // mClientStoreMarker == ClientStoreMarker::NotKnown
 		{
 			// Yes, choose one, the current time will do
 			box_time_t marker = GetCurrentBoxTime();

diff --git a/lib/bbackupd/BackupClientContext.h b/lib/bbackupd/BackupClientContext.h
@@ -61,11 +61,6 @@ class BackupClientContext : public DiffTimer
 	BackupClientDeleteList &GetDeleteList();
 	void PerformDeletions();
 
-	enum
-	{
-		ClientStoreMarker_NotKnown = 0
-	};
-
 	void SetClientStoreMarker(int64_t ClientStoreMarker) {mClientStoreMarker = ClientStoreMarker;}
 	int64_t GetClientStoreMarker() const {return mClientStoreMarker;}
 

diff --git a/lib/bbackupd/BackupDaemon.cpp b/lib/bbackupd/BackupDaemon.cpp
@@ -221,7 +221,7 @@ BackupDaemon::BackupDaemon()
 	  mDeleteRedundantLocationsAfter(0),
 	  mLastNotifiedEvent(SysadminNotifier::MAX),
 	  mDeleteUnusedRootDirEntriesAfter(0),
-	  mClientStoreMarker(BackupClientContext::ClientStoreMarker_NotKnown),
+	  mClientStoreMarker(ClientStoreMarker::NotKnown),
 	  mStorageLimitExceeded(false),
 	  mReadErrorsOnFilesystemObjects(false),
 	  mLastSyncTime(0),
@@ -896,7 +896,7 @@ void BackupDaemon::ResetCachedState()
 	// Clear state data
 	// Go back to beginning of time
 	mLastSyncTime = 0;
-	mClientStoreMarker = BackupClientContext::ClientStoreMarker_NotKnown;	// no store marker, so download everything
+	mClientStoreMarker = ClientStoreMarker::NotKnown;	// no store marker, so download everything
 	DeleteAllLocations();
 	DeleteAllIDMaps();
 }
@@ -3584,7 +3584,7 @@ bool BackupDaemon::DeserializeStoreObjectInfo(box_time_t & theLastSyncTime,
 
 	DeleteAllLocations();
 
-	mClientStoreMarker = BackupClientContext::ClientStoreMarker_NotKnown;
+	mClientStoreMarker = ClientStoreMarker::NotKnown;
 	theLastSyncTime = 0;
 	theNextSyncTime = 0;