diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2014-09-04 01:35:59 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2014-09-04 01:35:59 +0000 |
| commit | 75ad60bcc4d33589bb5afb307a87fd19b220a9e8 (patch) | |
| tree | 52ca7181df6248be83c9c2337b12e42fd228defe /lib/backupclient | |
| parent | 1f1d8355ad73eb9c0ab9aaeb069a21aecee78d6f (diff) | |
Define some functions to reduce duplication in testbbackupd.
Merged back changes from the test refactor branch to reduce diffs.
Fix wrong setting of log level in compare() function.
We want to only show errors if we expect mismatches, and show warnings if we
didn't expect mismatches. I had it the other way around before.
Diffstat (limited to 'lib/backupclient')
| -rw-r--r-- | lib/backupclient/BackupClientRestore.cpp | 8 | ||||
| -rw-r--r-- | lib/backupclient/BackupClientRestore.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/backupclient/BackupClientRestore.cpp b/lib/backupclient/BackupClientRestore.cpp index db72c4bd..a586dc47 100644 --- a/lib/backupclient/BackupClientRestore.cpp +++ b/lib/backupclient/BackupClientRestore.cpp @@ -204,13 +204,13 @@ typedef struct // -------------------------------------------------------------------------- // // Function -// Name: BackupClientRestoreDir(BackupProtocolClient &, +// Name: BackupClientRestoreDir(BackupProtocolCallable &, // int64_t, const char *, bool) // Purpose: Restore a directory // Created: 23/11/03 // // -------------------------------------------------------------------------- -static int BackupClientRestoreDir(BackupProtocolClient &rConnection, +static int BackupClientRestoreDir(BackupProtocolCallable &rConnection, int64_t DirectoryID, const std::string &rRemoteDirectoryName, const std::string &rLocalDirectoryName, RestoreParams &Params, RestoreResumeInfo &rLevel) @@ -813,7 +813,7 @@ static int BackupClientRestoreDir(BackupProtocolClient &rConnection, // -------------------------------------------------------------------------- // // Function -// Name: BackupClientRestore(BackupProtocolClient &, int64_t, +// Name: BackupClientRestore(BackupProtocolCallable &, int64_t, // const char *, bool, bool, bool, bool, bool) // Purpose: Restore a directory on the server to a local // directory on the disc. The local directory must not @@ -840,7 +840,7 @@ static int BackupClientRestoreDir(BackupProtocolClient &rConnection, // Created: 23/11/03 // // -------------------------------------------------------------------------- -int BackupClientRestore(BackupProtocolClient &rConnection, +int BackupClientRestore(BackupProtocolCallable &rConnection, int64_t DirectoryID, const std::string& RemoteDirectoryName, const std::string& LocalDirectoryName, bool PrintDots, bool RestoreDeleted, bool UndeleteAfterRestoreDeleted, bool Resume, diff --git a/lib/backupclient/BackupClientRestore.h b/lib/backupclient/BackupClientRestore.h index 77f09c2e..1f14c433 100644 --- a/lib/backupclient/BackupClientRestore.h +++ b/lib/backupclient/BackupClientRestore.h @@ -10,7 +10,7 @@ #ifndef BACKUPSCLIENTRESTORE_H #define BACKUPSCLIENTRESTORE__H -class BackupProtocolClient; +class BackupProtocolCallable; enum { @@ -22,7 +22,7 @@ enum Restore_CompleteWithErrors, }; -int BackupClientRestore(BackupProtocolClient &rConnection, +int BackupClientRestore(BackupProtocolCallable &rConnection, int64_t DirectoryID, const std::string& RemoteDirectoryName, const std::string& LocalDirectoryName, |