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 /Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.cpp | |
| 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 'Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.cpp')
| -rw-r--r-- | Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.cpp b/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.cpp index 56013ca..4023be3 100644 --- a/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.cpp +++ b/Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.cpp | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | /* | 7 | /* |
| 8 | * Copyright (c) 2013-2016 Isode Limited. | 8 | * Copyright (c) 2013-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 | */ |
| @@ -56,14 +56,14 @@ void RemoteJingleTransportCandidateSelector::stopSelectingCandidate() { | |||
| 56 | 56 | ||
| 57 | void RemoteJingleTransportCandidateSelector::tryNextCandidate() { | 57 | void RemoteJingleTransportCandidateSelector::tryNextCandidate() { |
| 58 | if (candidates.empty()) { | 58 | if (candidates.empty()) { |
| 59 | SWIFT_LOG(debug) << "No more candidates" << std::endl; | 59 | SWIFT_LOG(debug) << "No more candidates"; |
| 60 | onCandidateSelectFinished( | 60 | onCandidateSelectFinished( |
| 61 | boost::optional<JingleS5BTransportPayload::Candidate>(), std::shared_ptr<SOCKS5BytestreamClientSession>()); | 61 | boost::optional<JingleS5BTransportPayload::Candidate>(), std::shared_ptr<SOCKS5BytestreamClientSession>()); |
| 62 | } | 62 | } |
| 63 | else { | 63 | else { |
| 64 | lastCandidate = candidates.top(); | 64 | lastCandidate = candidates.top(); |
| 65 | candidates.pop(); | 65 | candidates.pop(); |
| 66 | SWIFT_LOG(debug) << "Trying candidate " << lastCandidate.cid << std::endl; | 66 | SWIFT_LOG(debug) << "Trying candidate " << lastCandidate.cid; |
| 67 | if ((lastCandidate.type == JingleS5BTransportPayload::Candidate::DirectType && options.isDirectAllowed()) || | 67 | if ((lastCandidate.type == JingleS5BTransportPayload::Candidate::DirectType && options.isDirectAllowed()) || |
| 68 | (lastCandidate.type == JingleS5BTransportPayload::Candidate::AssistedType && options.isAssistedAllowed()) || | 68 | (lastCandidate.type == JingleS5BTransportPayload::Candidate::AssistedType && options.isAssistedAllowed()) || |
| 69 | (lastCandidate.type == JingleS5BTransportPayload::Candidate::ProxyType && options.isProxiedAllowed())) { | 69 | (lastCandidate.type == JingleS5BTransportPayload::Candidate::ProxyType && options.isProxiedAllowed())) { |
| @@ -75,7 +75,7 @@ void RemoteJingleTransportCandidateSelector::tryNextCandidate() { | |||
| 75 | s5bSession->start(); | 75 | s5bSession->start(); |
| 76 | } | 76 | } |
| 77 | else { | 77 | else { |
| 78 | SWIFT_LOG(debug) << "Can't handle this type of candidate" << std::endl; | 78 | SWIFT_LOG(debug) << "Can't handle this type of candidate"; |
| 79 | tryNextCandidate(); | 79 | tryNextCandidate(); |
| 80 | } | 80 | } |
| 81 | } | 81 | } |