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/Parser | |
| 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/Parser')
| -rw-r--r-- | Swiften/Parser/IQParser.cpp | 4 | ||||
| -rw-r--r-- | Swiften/Parser/LibXMLParser.cpp | 2 | ||||
| -rw-r--r-- | Swiften/Parser/PresenceParser.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Parser/IQParser.cpp b/Swiften/Parser/IQParser.cpp index 5cfae34..363f7ec 100644 --- a/Swiften/Parser/IQParser.cpp +++ b/Swiften/Parser/IQParser.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2016 Isode Limited. | 2 | * Copyright (c) 2010-2019 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -32,7 +32,7 @@ void IQParser::handleStanzaAttributes(const AttributeMap& attributes) { | |||
| 32 | getStanzaGeneric()->setType(IQ::Error); | 32 | getStanzaGeneric()->setType(IQ::Error); |
| 33 | } | 33 | } |
| 34 | else { | 34 | else { |
| 35 | SWIFT_LOG(warning) << "Unknown IQ type: " << *type << std::endl; | 35 | SWIFT_LOG(warning) << "Unknown IQ type: " << *type; |
| 36 | getStanzaGeneric()->setType(IQ::Get); | 36 | getStanzaGeneric()->setType(IQ::Get); |
| 37 | } | 37 | } |
| 38 | } | 38 | } |
diff --git a/Swiften/Parser/LibXMLParser.cpp b/Swiften/Parser/LibXMLParser.cpp index 158958b..32b91a1 100644 --- a/Swiften/Parser/LibXMLParser.cpp +++ b/Swiften/Parser/LibXMLParser.cpp | |||
| @@ -34,7 +34,7 @@ static void handleStartElement(void* parser, const xmlChar* name, const xmlChar* | |||
| 34 | AttributeMap attributeValues; | 34 | AttributeMap attributeValues; |
| 35 | if (nbDefaulted != 0) { | 35 | if (nbDefaulted != 0) { |
| 36 | // Just because i don't understand what this means yet :-) | 36 | // Just because i don't understand what this means yet :-) |
| 37 | SWIFT_LOG(error) << "Unexpected nbDefaulted on XML element" << std::endl; | 37 | SWIFT_LOG(error) << "Unexpected nbDefaulted on XML element"; |
| 38 | } | 38 | } |
| 39 | for (int i = 0; i < nbAttributes*5; i += 5) { | 39 | for (int i = 0; i < nbAttributes*5; i += 5) { |
| 40 | std::string attributeName = asString(attributes[i]); | 40 | std::string attributeName = asString(attributes[i]); |
diff --git a/Swiften/Parser/PresenceParser.cpp b/Swiften/Parser/PresenceParser.cpp index 0235a12..f73e9d8 100644 --- a/Swiften/Parser/PresenceParser.cpp +++ b/Swiften/Parser/PresenceParser.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2016 Isode Limited. | 2 | * Copyright (c) 2010-2019 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -41,7 +41,7 @@ void PresenceParser::handleStanzaAttributes(const AttributeMap& attributes) { | |||
| 41 | getStanzaGeneric()->setType(Presence::Error); | 41 | getStanzaGeneric()->setType(Presence::Error); |
| 42 | } | 42 | } |
| 43 | else { | 43 | else { |
| 44 | SWIFT_LOG(error) << "Unknown Presence type: " << *type << std::endl; | 44 | SWIFT_LOG(error) << "Unknown Presence type: " << *type; |
| 45 | getStanzaGeneric()->setType(Presence::Available); | 45 | getStanzaGeneric()->setType(Presence::Available); |
| 46 | } | 46 | } |
| 47 | } | 47 | } |