Changeset 2481 for box/trunk/lib/backupclient/BackupStoreObjectDump.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/backupclient/BackupStoreObjectDump.cpp (modified) (5 diffs)

box/trunk/lib/backupclient/BackupStoreObjectDump.cpp

@@ -71 +71 @@
 
         // So repeated filenames can be illustrated, even though they can't be decoded
-        std::map<BackupStoreFilename, int> nameNum;
+        std::map<std::string, int> nameNum;
         int nameNumI = 0;
 
@@ -79 +79 @@
         {
                 // Choose file name index number for this file
-                std::map<BackupStoreFilename, int>::iterator nn(nameNum.find((*i)->GetName()));
+                std::map<std::string, int>::iterator nn(nameNum.find((*i)->GetName().GetEncodedFilename()));
                 int ni = nameNumI;
                 if(nn != nameNum.end())
@@ -87 +87 @@
                 else
                 {
-                        nameNum[(*i)->GetName()] = nameNumI;
+                        nameNum[(*i)->GetName().GetEncodedFilename()] = nameNumI;
                         ++nameNumI;
                 }
@@ -125 +125 @@
                         (*i)->GetAttributesHash(),
                         (*i)->GetAttributes().GetSize(),
-                        (*i)->GetName().size(),
+                        (*i)->GetName().GetEncodedFilename().size(),
                         ni,
                         ((f & BackupStoreDirectory::Entry::Flags_File)?" file":""),
@@ -174 +174 @@
         BackupStoreFilename fn;
         fn.ReadFromStream(rFile, IOStream::TimeOutInfinite);
-        OutputLine(file, ToTrace, "Filename size: %d\n", fn.size());
+        OutputLine(file, ToTrace, "Filename size: %d\n",
+                fn.GetEncodedFilename().size());
         
         BackupClientFileAttributes attr;