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/Network/WindowsProxyProvider.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/Network/WindowsProxyProvider.cpp')
| -rw-r--r-- | Swiften/Network/WindowsProxyProvider.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/Network/WindowsProxyProvider.cpp b/Swiften/Network/WindowsProxyProvider.cpp index 9a60bb4..13fdb25 100644 --- a/Swiften/Network/WindowsProxyProvider.cpp +++ b/Swiften/Network/WindowsProxyProvider.cpp | |||
| @@ -52,7 +52,7 @@ WindowsProxyProvider::WindowsProxyProvider() | |||
| 52 | for(auto&& proxy : proxies) { | 52 | for(auto&& proxy : proxies) { |
| 53 | if(proxy.find('=') != std::string::npos) { | 53 | if(proxy.find('=') != std::string::npos) { |
| 54 | protocolAndProxy = String::getSplittedAtFirst(proxy, '='); | 54 | protocolAndProxy = String::getSplittedAtFirst(proxy, '='); |
| 55 | SWIFT_LOG(debug) << "Found proxy: " << protocolAndProxy.first << " => " << protocolAndProxy.second << std::endl; | 55 | SWIFT_LOG(debug) << "Found proxy: " << protocolAndProxy.first << " => " << protocolAndProxy.second; |
| 56 | if(protocolAndProxy.first.compare("socks") == 0) { | 56 | if(protocolAndProxy.first.compare("socks") == 0) { |
| 57 | socksProxy = getAsHostAddressPort(protocolAndProxy.second); | 57 | socksProxy = getAsHostAddressPort(protocolAndProxy.second); |
| 58 | } | 58 | } |
| @@ -86,7 +86,7 @@ HostAddressPort WindowsProxyProvider::getAsHostAddressPort(std::string proxy) { | |||
| 86 | ret = HostAddressPort(HostAddress::fromString(tmp.first).get(), port); | 86 | ret = HostAddressPort(HostAddress::fromString(tmp.first).get(), port); |
| 87 | } | 87 | } |
| 88 | catch(...) { | 88 | catch(...) { |
| 89 | SWIFT_LOG(error) << "Exception occured while parsing windows proxy \"getHostAddressPort\"." << std::endl; | 89 | SWIFT_LOG(error) << "Exception occured while parsing windows proxy \"getHostAddressPort\"."; |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | return ret; | 92 | return ret; |