diff options
Diffstat (limited to 'lib/backupstore')
-rw-r--r-- | lib/backupstore/BackupStoreAccounts.cpp | 2 | ||||
-rw-r--r-- | lib/backupstore/BackupStoreCheck.cpp | 2 | ||||
-rw-r--r-- | lib/backupstore/BackupStoreCheck2.cpp | 2 | ||||
-rw-r--r-- | lib/backupstore/BackupStoreRefCountDatabase.cpp | 4 | ||||
-rw-r--r-- | lib/backupstore/BackupStoreRefCountDatabase.h | 9 | ||||
-rw-r--r-- | lib/backupstore/HousekeepStoreAccount.cpp | 2 |
6 files changed, 11 insertions, 10 deletions
diff --git a/lib/backupstore/BackupStoreAccounts.cpp b/lib/backupstore/BackupStoreAccounts.cpp index bbf85f8a..22628017 100644 --- a/lib/backupstore/BackupStoreAccounts.cpp +++ b/lib/backupstore/BackupStoreAccounts.cpp @@ -205,7 +205,7 @@ void BackupStoreAccounts::LockAccount(int32_t ID, NamedLock& rNamedLock) { THROW_EXCEPTION_MESSAGE(BackupStoreException, CouldNotLockStoreAccount, "Failed to get exclusive " - "lock on account " << ID); + "lock on account " << BOX_FORMAT_ACCOUNT(ID)); } } diff --git a/lib/backupstore/BackupStoreCheck.cpp b/lib/backupstore/BackupStoreCheck.cpp index 128d97d4..70fe4a1e 100644 --- a/lib/backupstore/BackupStoreCheck.cpp +++ b/lib/backupstore/BackupStoreCheck.cpp @@ -918,7 +918,7 @@ bool BackupStoreCheck::CheckDirectoryEntry(BackupStoreDirectory::Entry& rEntry, else { // This is OK for files, they might move - BOX_NOTICE("File ID " << + BOX_INFO("File ID " << BOX_FORMAT_OBJECTID(rEntry.GetObjectID()) << " has different container ID, " "probably moved"); diff --git a/lib/backupstore/BackupStoreCheck2.cpp b/lib/backupstore/BackupStoreCheck2.cpp index ae3ca919..15403f3d 100644 --- a/lib/backupstore/BackupStoreCheck2.cpp +++ b/lib/backupstore/BackupStoreCheck2.cpp @@ -684,7 +684,7 @@ void BackupStoreCheck::WriteNewStoreInfo() if(mFixErrors) { info->Save(); - BOX_NOTICE("New store info file written successfully."); + BOX_INFO("New store info file written successfully."); } } diff --git a/lib/backupstore/BackupStoreRefCountDatabase.cpp b/lib/backupstore/BackupStoreRefCountDatabase.cpp index 86f75a55..3f3eb94b 100644 --- a/lib/backupstore/BackupStoreRefCountDatabase.cpp +++ b/lib/backupstore/BackupStoreRefCountDatabase.cpp @@ -155,8 +155,8 @@ std::string BackupStoreRefCountDatabase::GetFilename(const // Function // Name: BackupStoreRefCountDatabase::Create(int32_t, // const std::string &, int, bool) -// Purpose: Create a new database, overwriting an existing -// one only if AllowOverwrite is true. +// Purpose: Create a blank database, using a temporary file that +// you must Discard() or Commit() to make permanent. // Created: 2003/08/28 // // -------------------------------------------------------------------------- diff --git a/lib/backupstore/BackupStoreRefCountDatabase.h b/lib/backupstore/BackupStoreRefCountDatabase.h index f0c1222f..797f05dc 100644 --- a/lib/backupstore/BackupStoreRefCountDatabase.h +++ b/lib/backupstore/BackupStoreRefCountDatabase.h @@ -66,22 +66,23 @@ private: BackupStoreRefCountDatabase(const BackupStoreRefCountDatabase &); public: - // Create a new database for a new account. + // Create a blank database, using a temporary file that you must + // Discard() or Commit() to make permanent. static std::auto_ptr<BackupStoreRefCountDatabase> Create (const BackupStoreAccountDatabase::Entry& rAccount); void Commit(); void Discard(); - + // Load it from the store static std::auto_ptr<BackupStoreRefCountDatabase> Load(const BackupStoreAccountDatabase::Entry& rAccount, bool ReadOnly); - + typedef uint32_t refcount_t; // Data access functions refcount_t GetRefCount(int64_t ObjectID) const; int64_t GetLastObjectIDUsed() const; - + // Data modification functions void AddReference(int64_t ObjectID); // RemoveReference returns false if refcount drops to zero diff --git a/lib/backupstore/HousekeepStoreAccount.cpp b/lib/backupstore/HousekeepStoreAccount.cpp index e5339acc..75e7c8ca 100644 --- a/lib/backupstore/HousekeepStoreAccount.cpp +++ b/lib/backupstore/HousekeepStoreAccount.cpp @@ -235,7 +235,7 @@ bool HousekeepStoreAccount::DoHousekeeping(bool KeepTryingForever) catch(BoxException &e) { BOX_WARNING("Reference count database was missing or " - "corrupted during housekeeping, cannot check for " + "corrupted during housekeeping, cannot check it for " "errors."); } |