diff options
author | Chris Wilson <chris+github@qwirx.com> | 2014-09-04 01:36:08 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2014-09-04 01:36:08 +0000 |
commit | 426a506afd1ffb3bd67e61b4693ee9bb968097a1 (patch) | |
tree | a6a726552411a781e692de657e3a630fa8d65d65 /lib/backupclient | |
parent | 75ad60bcc4d33589bb5afb307a87fd19b220a9e8 (diff) |
Simplify code with macros, update comments and fix whitespace.
Hopefully all of these changes are inconsequential.
Merged back changes from the test refactor branch to reduce diffs.
Diffstat (limited to 'lib/backupclient')
-rw-r--r-- | lib/backupclient/BackupClientRestore.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/backupclient/BackupClientRestore.cpp b/lib/backupclient/BackupClientRestore.cpp index a586dc47..d3300604 100644 --- a/lib/backupclient/BackupClientRestore.cpp +++ b/lib/backupclient/BackupClientRestore.cpp @@ -224,7 +224,7 @@ static int BackupClientRestoreDir(BackupProtocolCallable &rConnection, DIRECTORY_SEPARATOR_ASCHAR + rLevel.mNextLevelLocalName); BackupClientRestoreDir(rConnection, rLevel.mNextLevelID, - rRemoteDirectoryName + '/' + + rRemoteDirectoryName + '/' + rLevel.mNextLevelLocalName, localDirname, Params, *rLevel.mpNextLevel); @@ -232,7 +232,7 @@ static int BackupClientRestoreDir(BackupProtocolCallable &rConnection, rLevel.mRestoredObjects.insert(rLevel.mNextLevelID); // Remove the level for the recursed directory - rLevel.RemoveLevel(); + rLevel.RemoveLevel(); } // Create the local directory, if not already done. @@ -299,7 +299,7 @@ static int BackupClientRestoreDir(BackupProtocolCallable &rConnection, } std::string parentDirectoryName(rLocalDirectoryName); - if(parentDirectoryName[parentDirectoryName.size() - 1] == + if(parentDirectoryName[parentDirectoryName.size() - 1] == DIRECTORY_SEPARATOR_ASCHAR) { parentDirectoryName.resize(parentDirectoryName.size() - 1); @@ -309,7 +309,7 @@ static int BackupClientRestoreDir(BackupProtocolCallable &rConnection, if(lastSlash == std::string::npos) { - // might be a forward slash separator, + // might be a forward slash separator, // especially in the unit tests! lastSlash = parentDirectoryName.rfind('/'); } @@ -889,7 +889,7 @@ int BackupClientRestore(BackupProtocolCallable &rConnection, } // Restore the directory - int result = BackupClientRestoreDir(rConnection, DirectoryID, + int result = BackupClientRestoreDir(rConnection, DirectoryID, RemoteDirectoryName, LocalDirectoryName, params, params.mResumeInfo); if (result != Restore_Complete) |