diff options
author | Chris Wilson <chris+github@qwirx.com> | 2013-09-19 23:10:42 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2013-09-19 23:10:42 +0000 |
commit | 42bb8be07da8ddab7a11848b88ffea3e47ccb7dd (patch) | |
tree | e71b6855d5add43b9ad22b81e1855b35840a3f5d /lib | |
parent | f2c9e2fbd251736b50f88cea07e8a97635b5c6fa (diff) |
Ensure that all errors that increment mNumberErrorsFound are reported as BOX_ERROR.
Remove debugging code for Sune Molgaard's issue with non-existent files.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/backupstore/BackupStoreCheck2.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/lib/backupstore/BackupStoreCheck2.cpp b/lib/backupstore/BackupStoreCheck2.cpp index 19c79304..90e21e7f 100644 --- a/lib/backupstore/BackupStoreCheck2.cpp +++ b/lib/backupstore/BackupStoreCheck2.cpp @@ -138,7 +138,7 @@ void BackupStoreCheck::CheckUnattachedObjects() if((flags & Flags_IsContained) == 0) { // Unattached object... - BOX_WARNING("Object " << + BOX_ERROR("Object " << BOX_FORMAT_OBJECTID(pblock->mID[e]) << " is unattached."); ++mNumberErrorsFound; @@ -159,15 +159,6 @@ void BackupStoreCheck::CheckUnattachedObjects() std::string filename; StoreStructure::MakeObjectFilename(pblock->mID[e], mStoreRoot, mDiscSetNumber, filename, false /* don't attempt to make sure the dir exists */); - // Debugging for Sune Molgaard's issue with non-existent files being - // detected as unattached and crashing later in CheckUnattachedObjects() - if (pblock->mID[e] == 0x90c1a) - { - BOX_INFO("Trying to open unattached " << - BOX_FORMAT_OBJECTID(pblock->mID[e]) << - " from " << filename << " on " << mDiscSetNumber); - } - // The easiest way to do this is to verify it again. Not such a bad penalty, because // this really shouldn't be done very often. { @@ -592,7 +583,7 @@ void BackupStoreCheck::WriteNewStoreInfo() } catch(...) { - BOX_WARNING("Load of existing store info failed, regenerating."); + BOX_ERROR("Load of existing store info failed, regenerating."); ++mNumberErrorsFound; } @@ -884,7 +875,7 @@ bool BackupStoreDirectory::CheckAndFix() // erase the thing from the list Entry *pentry = (*i); mEntries.erase(i); - + // And delete the entry object delete pentry; |