Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2019-11-19 13:36:05 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2019-11-19 13:58:45 (GMT) |
| commit | 261ba8d8595ed8cb90f9c4feb1d6ef642942bcba (patch) | |
| tree | c7e60d473509db8c4dbff5aa83fbde963d8dd75e /Swift/Controllers/FileTransfer | |
| parent | 697ae6ae84512a744958b24118197ec7bfdbc1f0 (diff) | |
| download | swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.zip swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.tar.bz2 | |
Remove std::endl from SWIFT_LOG calls
The std::endl is now added by ~Log, but only for output to stderr or a
log file. Calls to the Android logging system or manually set callbacks
will not include the newline in the logging output.
JIRA: SWIFT-430
Test-Information:
Unit tests pass on Debian 9
Checked that running Swift with logging to stderr still had a newline.
Change-Id: I096fdba78a3b8f87db2097951c28c528592183e8
Diffstat (limited to 'Swift/Controllers/FileTransfer')
| -rw-r--r-- | Swift/Controllers/FileTransfer/FileTransferController.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.cpp b/Swift/Controllers/FileTransfer/FileTransferController.cpp index 27e9dbf..5b86a7b 100644 --- a/Swift/Controllers/FileTransfer/FileTransferController.cpp +++ b/Swift/Controllers/FileTransfer/FileTransferController.cpp | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | /* | 7 | /* |
| 8 | * Copyright (c) 2015-2017 Isode Limited. | 8 | * Copyright (c) 2015-2019 Isode Limited. |
| 9 | * All rights reserved. | 9 | * All rights reserved. |
| 10 | * See the COPYING file for more information. | 10 | * See the COPYING file for more information. |
| 11 | */ | 11 | */ |
| @@ -82,7 +82,7 @@ boost::uintmax_t FileTransferController::getSize() const { | |||
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | void FileTransferController::start(std::string& description) { | 84 | void FileTransferController::start(std::string& description) { |
| 85 | SWIFT_LOG(debug) << "FileTransferController::start" << std::endl; | 85 | SWIFT_LOG(debug) << "FileTransferController::start"; |
| 86 | fileReadStream = std::make_shared<FileReadBytestream>(boost::filesystem::path(filename)); | 86 | fileReadStream = std::make_shared<FileReadBytestream>(boost::filesystem::path(filename)); |
| 87 | OutgoingFileTransfer::ref outgoingTransfer = ftManager->createOutgoingFileTransfer(otherParty, boost::filesystem::path(filename), description, fileReadStream); | 87 | OutgoingFileTransfer::ref outgoingTransfer = ftManager->createOutgoingFileTransfer(otherParty, boost::filesystem::path(filename), description, fileReadStream); |
| 88 | if (outgoingTransfer) { | 88 | if (outgoingTransfer) { |
| @@ -98,7 +98,7 @@ void FileTransferController::start(std::string& description) { | |||
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | void FileTransferController::accept(std::string& file) { | 100 | void FileTransferController::accept(std::string& file) { |
| 101 | SWIFT_LOG(debug) << "FileTransferController::accept" << std::endl; | 101 | SWIFT_LOG(debug) << "FileTransferController::accept"; |
| 102 | IncomingFileTransfer::ref incomingTransfer = std::dynamic_pointer_cast<IncomingFileTransfer>(transfer); | 102 | IncomingFileTransfer::ref incomingTransfer = std::dynamic_pointer_cast<IncomingFileTransfer>(transfer); |
| 103 | if (incomingTransfer) { | 103 | if (incomingTransfer) { |
| 104 | fileWriteStream = std::make_shared<FileWriteBytestream>(boost::filesystem::path(file)); | 104 | fileWriteStream = std::make_shared<FileWriteBytestream>(boost::filesystem::path(file)); |