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/UnitTest | |
| 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/UnitTest')
| -rw-r--r-- | Swiften/FileTransfer/UnitTest/SOCKS5BytestreamClientSessionTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamClientSessionTest.cpp b/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamClientSessionTest.cpp index 80667b6..fad02da 100644 --- a/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamClientSessionTest.cpp +++ b/Swiften/FileTransfer/UnitTest/SOCKS5BytestreamClientSessionTest.cpp | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | /* | 7 | /* |
| 8 | * Copyright (c) 2015-2016 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 | */ |
| @@ -238,7 +238,7 @@ private: | |||
| 238 | std::shared_ptr<SafeByteArray> dataToSend; | 238 | std::shared_ptr<SafeByteArray> dataToSend; |
| 239 | //ByteArray failingData = Hexify::unhexify("8417947d1d305c72c11520ea7d2c6e787396705e72c312c6ccc3f66613d7cae1b91b7ab48e8b59a17d559c15fb51"); | 239 | //ByteArray failingData = Hexify::unhexify("8417947d1d305c72c11520ea7d2c6e787396705e72c312c6ccc3f66613d7cae1b91b7ab48e8b59a17d559c15fb51"); |
| 240 | //append(dataToSend, failingData); | 240 | //append(dataToSend, failingData); |
| 241 | //SWIFT_LOG(debug) << "hexed: " << Hexify::hexify(failingData) << std::endl; | 241 | //SWIFT_LOG(debug) << "hexed: " << Hexify::hexify(failingData); |
| 242 | do { | 242 | do { |
| 243 | ByteArray rndArray = generateRandomByteArray(correctData->size()); | 243 | ByteArray rndArray = generateRandomByteArray(correctData->size()); |
| 244 | dataToSend = createSafeByteArrayRef(vecptr(rndArray), rndArray.size()); | 244 | dataToSend = createSafeByteArrayRef(vecptr(rndArray), rndArray.size()); |
| @@ -255,7 +255,7 @@ private: | |||
| 255 | 255 | ||
| 256 | void handleConnectionDataWritten(const SafeByteArray& data) { | 256 | void handleConnectionDataWritten(const SafeByteArray& data) { |
| 257 | append(unprocessedInput, data); | 257 | append(unprocessedInput, data); |
| 258 | //SWIFT_LOG(debug) << "unprocessedInput (" << unprocessedInput.size() << "): " << Hexify::hexify(unprocessedInput) << std::endl; | 258 | //SWIFT_LOG(debug) << "unprocessedInput (" << unprocessedInput.size() << "): " << Hexify::hexify(unprocessedInput); |
| 259 | } | 259 | } |
| 260 | 260 | ||
| 261 | void handleSessionReady(bool error) { | 261 | void handleSessionReady(bool error) { |