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/QtUI/CAPICertificateSelector.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 'Swift/QtUI/CAPICertificateSelector.cpp')
| -rw-r--r-- | Swift/QtUI/CAPICertificateSelector.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Swift/QtUI/CAPICertificateSelector.cpp b/Swift/QtUI/CAPICertificateSelector.cpp index e47121b..7e4bc0b 100644 --- a/Swift/QtUI/CAPICertificateSelector.cpp +++ b/Swift/QtUI/CAPICertificateSelector.cpp | |||
| @@ -80,11 +80,11 @@ std::string selectCAPICertificate() { | |||
| 80 | if (titleLength == 0 || promptLength == 0) { | 80 | if (titleLength == 0 || promptLength == 0) { |
| 81 | int error = GetLastError(); | 81 | int error = GetLastError(); |
| 82 | switch (error) { | 82 | switch (error) { |
| 83 | case ERROR_INSUFFICIENT_BUFFER: SWIFT_LOG(error) << "Insufficient buffer for rendering cert dialog" << std::endl;break; | 83 | case ERROR_INSUFFICIENT_BUFFER: SWIFT_LOG(error) << "Insufficient buffer for rendering cert dialog"; break; |
| 84 | case ERROR_INVALID_FLAGS: SWIFT_LOG(error) << "Invalid flags for rendering cert dialog" << std::endl;break; | 84 | case ERROR_INVALID_FLAGS: SWIFT_LOG(error) << "Invalid flags for rendering cert dialog"; break; |
| 85 | case ERROR_INVALID_PARAMETER: SWIFT_LOG(error) << "Invalid parameter for rendering cert dialog" << std::endl;break; | 85 | case ERROR_INVALID_PARAMETER: SWIFT_LOG(error) << "Invalid parameter for rendering cert dialog"; break; |
| 86 | case ERROR_NO_UNICODE_TRANSLATION: SWIFT_LOG(error) << "Invalid unicode for rendering cert dialog" << std::endl;break; | 86 | case ERROR_NO_UNICODE_TRANSLATION: SWIFT_LOG(error) << "Invalid unicode for rendering cert dialog"; break; |
| 87 | default: SWIFT_LOG(error) << "Unexpected multibyte conversion errorcode" << std::endl; | 87 | default: SWIFT_LOG(error) << "Unexpected multibyte conversion errorcode"; |
| 88 | 88 | ||
| 89 | } | 89 | } |
| 90 | } | 90 | } |
| @@ -103,7 +103,7 @@ std::string selectCAPICertificate() { | |||
| 103 | 103 | ||
| 104 | if (hstore) { | 104 | if (hstore) { |
| 105 | if (CertCloseStore(hstore, 0) == FALSE) { | 105 | if (CertCloseStore(hstore, 0) == FALSE) { |
| 106 | SWIFT_LOG(debug) << "Failed to close the certificate store handle." << std::endl; | 106 | SWIFT_LOG(debug) << "Failed to close the certificate store handle."; |
| 107 | } | 107 | } |
| 108 | } | 108 | } |
| 109 | 109 | ||