Changeset 882

Timestamp:

31/08/2006 23:22:35 (5 years ago)

Author:

chris

Message:

Revert to trunk

File:

• box/chris/merge/lib/backupstore/BackupStoreCheck.cpp (modified) (3 diffs)

box/chris/merge/lib/backupstore/BackupStoreCheck.cpp

@@ -329 +329 @@
         StoreStructure::MakeObjectFilename(StartID, mStoreRoot, mDiscSetNumber, dirName, false /* don't make sure the dir exists */);
         // Check expectations
-        ASSERT(dirName.size() > 4 && 
-                dirName[dirName.size() - 4] == DIRECTORY_SEPARATOR_ASCHAR);
+        ASSERT(dirName.size() > 4 && dirName[dirName.size() - 4] == '/');
         // Remove the filename from it
         dirName.resize(dirName.size() - 4); // four chars for "/o00"
@@ -379 +378 @@
                 {
                         // Unexpected or bad file, delete it
-                        ::printf("Spurious file %s" DIRECTORY_SEPARATOR "%s "
-                                "found%s\n", dirName.c_str(), (*i).c_str(), 
-                                mFixErrors?", deleting":"");
+                        ::printf("Spurious file %s/%s found%s\n", dirName.c_str(), (*i).c_str(), mFixErrors?", deleting":"");
                         ++mNumberErrorsFound;
                         if(mFixErrors)
@@ -470 +467 @@
                 
                 // Add to usage counts
-                int64_t s = file->GetDiscUsageInBlocks();
-                mBlocksUsed += s;
+                mBlocksUsed += size;
                 if(!isFile)
                 {
-                        mBlocksInDirectories += s;
+                        mBlocksInDirectories += size;
                 }
         }