From f43529b2c37134b76e98239096419d96b325d4f9 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 15 Aug 2014 22:47:20 +0000 Subject: Rename rFilename argument to BackupClientDirectoryRecord::UploadFile, add remote path. rFilename renamed to rLocalPath to improve code clarity. rRemotePath added to allow it to be passed to notifier methods. Conflicts: bin/bbackupd/BackupClientDirectoryRecord.cpp --- bin/bbackupd/BackupClientDirectoryRecord.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bin/bbackupd/BackupClientDirectoryRecord.h') diff --git a/bin/bbackupd/BackupClientDirectoryRecord.h b/bin/bbackupd/BackupClientDirectoryRecord.h index ec0ec86b..1f737839 100644 --- a/bin/bbackupd/BackupClientDirectoryRecord.h +++ b/bin/bbackupd/BackupClientDirectoryRecord.h @@ -162,7 +162,8 @@ private: int64_t UploadFile(SyncParams &rParams, const std::string &rFilename, const std::string &rNonVssFilePath, - const BackupStoreFilename &rStoreFilename, + const std::string &rRemotePath, + const BackupStoreFilenameClear &rStoreFilename, int64_t FileSize, box_time_t ModificationTime, box_time_t AttributesHash, bool NoPreviousVersionOnServer); void SetErrorWhenReadingFilesystemObject(SyncParams &rParams, -- cgit v1.2.3