Refactor BackupStoreCheck to use BackupFileSystem, part 8

Remove last vestiges of RaidFile from BackupStoreCheck.
boxbackup · Oct 7, 2017 · 1eab33a · 1eab33a
1 parent 65de4e0
commit 1eab33a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/lib/backupstore/BackupAccountControl.cpp b/lib/backupstore/BackupAccountControl.cpp
@@ -443,7 +443,7 @@ int BackupStoreAccountControl::CheckAccount(bool FixErrors, bool Quiet,
 	OPEN_ACCOUNT(FixErrors); // readWrite
 
 	// Check it
-	BackupStoreCheck check(*mapFileSystem, mRootDir, mDiscSetNum, FixErrors, Quiet);
+	BackupStoreCheck check(*mapFileSystem, FixErrors, Quiet);
 	check.Check();
 
 	if(ReturnNumErrorsFound)

diff --git a/lib/backupstore/BackupStoreCheck.cpp b/lib/backupstore/BackupStoreCheck.cpp
@@ -45,12 +45,8 @@
 //		Created: 21/4/04
 //
 // --------------------------------------------------------------------------
-BackupStoreCheck::BackupStoreCheck(BackupFileSystem& FileSystem,
-	const std::string &rStoreRoot, int DiscSetNumber, bool FixErrors,
-	bool Quiet)
-: mStoreRoot(rStoreRoot),
-  mDiscSetNumber(DiscSetNumber),
-  mAccountID(FileSystem.GetAccountID()), // will be 0 for S3BackupFileSystem
+BackupStoreCheck::BackupStoreCheck(BackupFileSystem& FileSystem, bool FixErrors, bool Quiet)
+: mAccountID(FileSystem.GetAccountID()), // will be 0 for S3BackupFileSystem
   mFixErrors(FixErrors),
   mQuiet(Quiet),
   mNumberErrorsFound(0),

diff --git a/lib/backupstore/BackupStoreCheck.h b/lib/backupstore/BackupStoreCheck.h
@@ -73,8 +73,7 @@ typedef int64_t BackupStoreCheck_Size_t;
 class BackupStoreCheck
 {
 public:
-	BackupStoreCheck(BackupFileSystem& rFileSystem, const std::string &rStoreRoot,
-		int DiscSetNumber, bool FixErrors, bool Quiet);
+	BackupStoreCheck(BackupFileSystem& rFileSystem, bool FixErrors, bool Quiet);
 	~BackupStoreCheck();
 
 private:
@@ -171,8 +170,6 @@ class BackupStoreCheck
 #endif
 
 private:
-	std::string mStoreRoot;
-	int mDiscSetNumber;
 	int32_t mAccountID;
 	std::string mAccountName;
 	bool mFixErrors;

diff --git a/lib/backupstore/BackupStoreCheck2.cpp b/lib/backupstore/BackupStoreCheck2.cpp
@@ -23,9 +23,6 @@
 #include "BackupStoreObjectMagic.h"
 #include "BackupStoreRefCountDatabase.h"
 #include "MemBlockStream.h"
-#include "RaidFileRead.h"
-#include "RaidFileWrite.h"
-#include "StoreStructure.h"
 
 #include "MemLeakFindOn.h"