Changeset 2481 for box/trunk/lib/backupstore/BackupStoreCheck2.cpp

Timestamp:

29/03/2009 14:51:24 (3 years ago)

Author:

chris

Message:

Change type of BackupStoreFilename? not to derive from std::string, so
it can't accidentally be used as one.

Fix use of encrypted filename in deleted file message, thanks to Kenny
Millington for reporting.

File:

• box/trunk/lib/backupstore/BackupStoreCheck2.cpp (modified) (3 diffs)

box/trunk/lib/backupstore/BackupStoreCheck2.cpp

@@ -751 +751 @@
                 // Records of things seen
                 std::set<int64_t> idsEncountered;
-                std::set<BackupStoreFilename> filenamesEncountered;
+                std::set<std::string> filenamesEncountered;
 
                 do
@@ -793 +793 @@
                                         // Check to see if the name has already been encountered -- if not, then it
                                         // needs to have the old version flag set
-                                        if(filenamesEncountered.find((*i)->GetName()) != filenamesEncountered.end())
+                                        if(filenamesEncountered.find((*i)->GetName().GetEncodedFilename()) != filenamesEncountered.end())
                                         {
                                                 // Seen before -- check old version flag set
@@ -819 +819 @@
                                                 
                                                 // Remember filename
-                                                filenamesEncountered.insert((*i)->GetName());
+                                                filenamesEncountered.insert((*i)->GetName().GetEncodedFilename());
                                         }
                                 }