Changeset 3082 for box/trunk/lib/backupclient

Timestamp:

02/02/2012 22:20:29 (4 months ago)

Author:

chris

Message:

Force all options to be present to BackupClientRestore?(), to fix
misinterpretation of char * arguments as bools. Use macros to
simplify test code. Test that locations not present when bbackupd
started will be detected and backed up if subsequently created.

Location:

box/trunk/lib/backupclient

Files:

• BackupClientRestore.cpp (modified) (1 diff)
• BackupClientRestore.h (modified) (1 diff)

box/trunk/lib/backupclient/BackupClientRestore.cpp

@@ -842 +842 @@
 // --------------------------------------------------------------------------
 int BackupClientRestore(BackupProtocolClient &rConnection,
-        int64_t DirectoryID, const char *RemoteDirectoryName,
-        const char *LocalDirectoryName, bool PrintDots, bool RestoreDeleted,
+        int64_t DirectoryID, const std::string& RemoteDirectoryName,
+        const std::string& LocalDirectoryName, bool PrintDots, bool RestoreDeleted,
         bool UndeleteAfterRestoreDeleted, bool Resume,
         bool ContinueAfterErrors)

box/trunk/lib/backupclient/BackupClientRestore.h

@@ -25 +25 @@
 int BackupClientRestore(BackupProtocolClient &rConnection,
         int64_t DirectoryID,
-        const char *RemoteDirectoryName,
-        const char *LocalDirectoryName,
-        bool PrintDots = false,
-        bool RestoreDeleted = false,
-        bool UndeleteAfterRestoreDeleted = false,
-        bool Resume = false,
-        bool ContinueAfterErrors = false);
+        const std::string& RemoteDirectoryName,
+        const std::string& LocalDirectoryName,
+        bool PrintDots,
+        bool RestoreDeleted,
+        bool UndeleteAfterRestoreDeleted,
+        bool Resume,
+        bool ContinueAfterErrors);
 
 #endif // BACKUPSCLIENTRESTORE__H