Changeset 2481 for box/trunk/bin/bbstored/HousekeepStoreAccount.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/bin/bbstored/HousekeepStoreAccount.cpp (modified) (3 diffs)

box/trunk/bin/bbstored/HousekeepStoreAccount.cpp

@@ -350 +350 @@
 
                 // map to count the distance from the mark
-                std::map<std::pair<BackupStoreFilename, int32_t>, int32_t> markVersionAges;
+                typedef std::pair<std::string, int32_t> version_t;
+                std::map<version_t, int32_t> markVersionAges;
                         // map of pair (filename, mark number) -> version age
 
@@ -368 +369 @@
                         // Work out ages of this version from the last mark
                         int32_t enVersionAge = 0;
-                        std::map<std::pair<BackupStoreFilename, int32_t>, int32_t>::iterator enVersionAgeI(markVersionAges.find(std::pair<BackupStoreFilename, int32_t>(en->GetName(), en->GetMarkNumber())));
+                        std::map<version_t, int32_t>::iterator enVersionAgeI(
+                                markVersionAges.find(
+                                        version_t(en->GetName().GetEncodedFilename(),
+                                                en->GetMarkNumber())));
                         if(enVersionAgeI != markVersionAges.end())
                         {
@@ -376 +380 @@
                         else
                         {
-                                markVersionAges[std::pair<BackupStoreFilename, int32_t>(en->GetName(), en->GetMarkNumber())] = enVersionAge;
+                                markVersionAges[version_t(en->GetName().GetEncodedFilename(), en->GetMarkNumber())] = enVersionAge;
                         }
                         // enVersionAge is now the age of this version.