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/Serializer/PayloadSerializers | |
| 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/Serializer/PayloadSerializers')
3 files changed, 7 insertions, 7 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp b/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp index aaac757..566d556 100644 --- a/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.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 | */ |
| @@ -93,7 +93,7 @@ std::string JinglePayloadSerializer::actionToString(JinglePayload::Action action | |||
| 93 | case JinglePayload::TransportReplace: | 93 | case JinglePayload::TransportReplace: |
| 94 | return "transport-replace"; | 94 | return "transport-replace"; |
| 95 | case JinglePayload::UnknownAction: | 95 | case JinglePayload::UnknownAction: |
| 96 | SWIFT_LOG(warning) << "Serializing unknown action value." << std::endl; | 96 | SWIFT_LOG(warning) << "Serializing unknown action value."; |
| 97 | return ""; | 97 | return ""; |
| 98 | } | 98 | } |
| 99 | assert(false); | 99 | assert(false); |
| @@ -103,7 +103,7 @@ std::string JinglePayloadSerializer::actionToString(JinglePayload::Action action | |||
| 103 | std::string JinglePayloadSerializer::reasonTypeToString(JinglePayload::Reason::Type type) const { | 103 | std::string JinglePayloadSerializer::reasonTypeToString(JinglePayload::Reason::Type type) const { |
| 104 | switch(type) { | 104 | switch(type) { |
| 105 | case JinglePayload::Reason::UnknownType: | 105 | case JinglePayload::Reason::UnknownType: |
| 106 | SWIFT_LOG(warning) << "Unknown jingle reason type!" << std::endl; | 106 | SWIFT_LOG(warning) << "Unknown jingle reason type!"; |
| 107 | return ""; | 107 | return ""; |
| 108 | case JinglePayload::Reason::AlternativeSession: | 108 | case JinglePayload::Reason::AlternativeSession: |
| 109 | return "alternative-session"; | 109 | return "alternative-session"; |
diff --git a/Swiften/Serializer/PayloadSerializers/ReferencePayloadSerializer.cpp b/Swiften/Serializer/PayloadSerializers/ReferencePayloadSerializer.cpp index 6e78a8d..128aac7 100644 --- a/Swiften/Serializer/PayloadSerializers/ReferencePayloadSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/ReferencePayloadSerializer.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2018 Isode Limited. | 2 | * Copyright (c) 2018-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 | */ |
| @@ -44,7 +44,7 @@ std::string ReferencePayloadSerializer::serializePayload(ReferencePayload::ref r | |||
| 44 | element.addNode(std::make_shared<XMLRawTextNode>(serializer->serialize(payload))); | 44 | element.addNode(std::make_shared<XMLRawTextNode>(serializer->serialize(payload))); |
| 45 | } | 45 | } |
| 46 | else { | 46 | else { |
| 47 | SWIFT_LOG(warning) << "Could not find serializer for " << typeid(*(payload.get())).name() << std::endl; | 47 | SWIFT_LOG(warning) << "Could not find serializer for " << typeid(*(payload.get())).name(); |
| 48 | } | 48 | } |
| 49 | } | 49 | } |
| 50 | } | 50 | } |
diff --git a/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp b/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp index 8c05c6f..f38f5b7 100644 --- a/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | /* | 7 | /* |
| 8 | * Copyright (c) 2016 Isode Limited. | 8 | * Copyright (c) 2016-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 | */ |
| @@ -199,7 +199,7 @@ namespace Swift { | |||
| 199 | case WhiteboardPayload::SessionTerminate: | 199 | case WhiteboardPayload::SessionTerminate: |
| 200 | return "session-terminate"; | 200 | return "session-terminate"; |
| 201 | case WhiteboardPayload::UnknownType: | 201 | case WhiteboardPayload::UnknownType: |
| 202 | SWIFT_LOG(warning) << "Serializing unknown action value." << std::endl; | 202 | SWIFT_LOG(warning) << "Serializing unknown action value."; |
| 203 | return ""; | 203 | return ""; |
| 204 | } | 204 | } |
| 205 | assert(false); | 205 | assert(false); |