[Box Backup-commit] COMMIT r3106 - box/trunk/lib/backupstore
subversion at boxbackup.org
subversion at boxbackup.org
Sat Apr 28 19:25:51 BST 2012
Author: chris
Date: 2012-04-28 19:25:50 +0100 (Sat, 28 Apr 2012)
New Revision: 3106
Modified:
box/trunk/lib/backupstore/BackupStoreFilenameClear.cpp
box/trunk/lib/backupstore/BackupStoreFilenameClear.h
Log:
Move private variables out of hidden namespace to help debugging.
Modified: box/trunk/lib/backupstore/BackupStoreFilenameClear.cpp
===================================================================
--- box/trunk/lib/backupstore/BackupStoreFilenameClear.cpp 2012-04-28 18:21:55 UTC (rev 3105)
+++ box/trunk/lib/backupstore/BackupStoreFilenameClear.cpp 2012-04-28 18:25:50 UTC (rev 3106)
@@ -17,13 +17,9 @@
#include "MemLeakFindOn.h"
-// Hide private variables from the rest of the world
-namespace
-{
- int sEncodeMethod = BackupStoreFilename::Encoding_Clear;
- CipherContext sBlowfishEncrypt;
- CipherContext sBlowfishDecrypt;
-}
+int BackupStoreFilenameClear::sEncodeMethod = BackupStoreFilename::Encoding_Clear;
+CipherContext BackupStoreFilenameClear::sBlowfishEncrypt;
+CipherContext BackupStoreFilenameClear::sBlowfishDecrypt;
// --------------------------------------------------------------------------
//
Modified: box/trunk/lib/backupstore/BackupStoreFilenameClear.h
===================================================================
--- box/trunk/lib/backupstore/BackupStoreFilenameClear.h 2012-04-28 18:21:55 UTC (rev 3105)
+++ box/trunk/lib/backupstore/BackupStoreFilenameClear.h 2012-04-28 18:25:50 UTC (rev 3106)
@@ -11,9 +11,8 @@
#define BACKUPSTOREFILENAMECLEAR__H
#include "BackupStoreFilename.h"
+#include "CipherContext.h"
-class CipherContext;
-
// --------------------------------------------------------------------------
//
// Class
@@ -54,6 +53,9 @@
private:
mutable BackupStoreFilename_base mClearFilename;
+ static CipherContext sBlowfishEncrypt;
+ static CipherContext sBlowfishDecrypt;
+ static int sEncodeMethod;
};
#endif // BACKUPSTOREFILENAMECLEAR__H
More information about the Boxbackup-commit
mailing list