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
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/SASL
parent: 697ae6ae84512a744958b24118197ec7bfdbc1f0 (diff)
download: swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.zip
swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.tar.bz2
3 files changed, 39 insertions, 39 deletions
diff --git a/Swiften/SASL/WindowsAuthentication.cpp b/Swiften/SASL/WindowsAuthentication.cpp
index b86381b..f951fac 100644
--- a/Swiften/SASL/WindowsAuthentication.cpp
+++ b/Swiften/SASL/WindowsAuthentication.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/SASL/WindowsAuthentication.h>
 
@@ -13,20 +13,20 @@
 #include <Swiften/Base/Log.h>
 #include <Swiften/Base/String.h>
 
 #define ASSIGN_ERROR(status, errorCode) \
 { \
     errorCode = std::make_shared<boost::system::error_code>(status, boost::system::system_category()); \
-    SWIFT_LOG(debug) << std::hex << "status: 0x" << status << ": " << errorCode->message() << std::endl; \
+    SWIFT_LOG(debug) << std::hex << "status: 0x" << status << ": " << errorCode->message(); \
 }
 
 #define ASSIGN_SEC_ERROR(status, errorCode) \
 { \
     if (status == SEC_E_OK) \
     { \
-        SWIFT_LOG(debug) << "success" << std::endl; \
+        SWIFT_LOG(debug) << "success"; \
     } \
     else { \
         ASSIGN_ERROR(status, errorCode); \
     } \
 }
 
@@ -43,20 +43,20 @@ std::shared_ptr<boost::system::error_code> getUserNameEx(std::string& userName,
 
         /* length after this call will contain the required length if current length is not enough - so the next call should succeed */
         if (GetUserNameExW(NameSamCompatible, vecptr(value), &length)) {
             std::size_t position;
 
             userName = convertWStringToString(std::wstring(vecptr(value), length));
-            SWIFT_LOG(debug) << "User Name: " << userName << std::endl;
+            SWIFT_LOG(debug) << "User Name: " << userName;
 
             position = userName.find("\\");
             clientName = userName.substr(position + 1);
-            SWIFT_LOG(debug) << "Client name: " << clientName << std::endl;
+            SWIFT_LOG(debug) << "Client name: " << clientName;
 
             serverName = userName.substr(0, position);
-            SWIFT_LOG(debug) << "Server name: " << serverName << std::endl;
+            SWIFT_LOG(debug) << "Server name: " << serverName;
 
             break;
         }
 
         status = GetLastError();
         if ((firstCall == false) || (status != ERROR_MORE_DATA)) {
@@ -158,13 +158,13 @@ std::shared_ptr<boost::system::error_code> initializeSecurityContext(const boost
     }
     if ((status == SEC_E_OK) || (status == SEC_I_COMPLETE_NEEDED)) {
         *haveCompleteContext = true;
     }
     if ((status == SEC_E_OK) || (status == SEC_I_COMPLETE_AND_CONTINUE) || (status == SEC_I_COMPLETE_NEEDED) || (status == SEC_I_CONTINUE_NEEDED)) {
         outputToken = createSafeByteArray (static_cast<unsigned char *>(outputTokenBuffer.pvBuffer), outputTokenBuffer.cbBuffer);
-        SWIFT_LOG(debug) << "outputToken.size(): " << outputToken.size() << std::endl;
+        SWIFT_LOG(debug) << "outputToken.size(): " << outputToken.size();
         freeContextBuffer(outputTokenBuffer.pvBuffer);
 
         return std::shared_ptr<boost::system::error_code>(); /* success */
     }
 
     return errorCode;
@@ -226,29 +226,29 @@ std::shared_ptr<boost::system::error_code> decryptMessage(const PCtxtHandle cont
     messageBuffer[0].pvBuffer = static_cast<void *>(vecptr(inputMessage));
 
     messageBuffer[1].BufferType = SECBUFFER_DATA;
     messageBuffer[1].cbBuffer = 0;
     messageBuffer[1].pvBuffer = NULL;
 
-    SWIFT_LOG(debug) << "inputMessage.size(): " << inputMessage.size() << std::endl;
+    SWIFT_LOG(debug) << "inputMessage.size(): " << inputMessage.size();
 
     status = DecryptMessage(
             contextHandle,
             &inOut,
             0, /* Don't maintain sequence numbers */
             &qualityOfProtection);
     ASSIGN_SEC_ERROR(status, errorCode);
     if (status == SEC_E_OK) {
         if (qualityOfProtection == SECQOP_WRAP_NO_ENCRYPT) {
-            SWIFT_LOG(debug) << "Message was signed only" << std::endl;
+            SWIFT_LOG(debug) << "Message was signed only";
         }
         else {
-            SWIFT_LOG(debug) << "Message was encrypted" << std::endl;
+            SWIFT_LOG(debug) << "Message was encrypted";
         }
 
-        SWIFT_LOG(debug) << "messageBuffer[1].cbBuffer: " << messageBuffer[1].cbBuffer << std::endl;
+        SWIFT_LOG(debug) << "messageBuffer[1].cbBuffer: " << messageBuffer[1].cbBuffer;
 
         decrypted = createSafeByteArray (static_cast<unsigned char *>(messageBuffer[1].pvBuffer), messageBuffer[1].cbBuffer);
     }
 
     return errorCode;
 }
@@ -278,28 +278,28 @@ std::shared_ptr<boost::system::error_code> encryptMessage(const PCtxtHandle cont
     messageBuffer[1].pvBuffer = (void *) vecptr(inputMessage);
 
     messageBuffer[2].BufferType = SECBUFFER_PADDING;
     messageBuffer[2].cbBuffer = sizes.cbBlockSize;
     messageBuffer[2].pvBuffer = vecptr(blockSize);
 
-    SWIFT_LOG(debug) << "sizes.cbSecurityTrailer: " << sizes.cbSecurityTrailer << std::endl;
-    SWIFT_LOG(debug) << "inputMessage.size(): " << inputMessage.size() << std::endl;
-    SWIFT_LOG(debug) << "sizes.cbBlockSize: " << sizes.cbBlockSize << std::endl;
+    SWIFT_LOG(debug) << "sizes.cbSecurityTrailer: " << sizes.cbSecurityTrailer;
+    SWIFT_LOG(debug) << "inputMessage.size(): " << inputMessage.size();
+    SWIFT_LOG(debug) << "sizes.cbBlockSize: " << sizes.cbBlockSize;
 
     status = EncryptMessage(
             contextHandle,
             SECQOP_WRAP_NO_ENCRYPT,
             &inOut,
             0); /* Don't maintain sequence numbers */
     ASSIGN_SEC_ERROR(status, errorCode);
     if (status == SEC_E_OK) {
         unsigned char* pointer;
 
-        SWIFT_LOG(debug) << "messageBuffer[0].cbBuffer: " << messageBuffer[0].cbBuffer << std::endl;
-        SWIFT_LOG(debug) << "messageBuffer[1].cbBuffer: " << messageBuffer[1].cbBuffer << std::endl;
-        SWIFT_LOG(debug) << "messageBuffer[2].cbBuffer: " << messageBuffer[2].cbBuffer << std::endl;
+        SWIFT_LOG(debug) << "messageBuffer[0].cbBuffer: " << messageBuffer[0].cbBuffer;
+        SWIFT_LOG(debug) << "messageBuffer[1].cbBuffer: " << messageBuffer[1].cbBuffer;
+        SWIFT_LOG(debug) << "messageBuffer[2].cbBuffer: " << messageBuffer[2].cbBuffer;
 
         output.resize(messageBuffer[0].cbBuffer + messageBuffer[1].cbBuffer + messageBuffer[2].cbBuffer);
         pointer = vecptr(output);
         for (size_t i = 0; i < inOut.cBuffers; i++) {
             if (messageBuffer[i].cbBuffer) {
                 memcpy(pointer, messageBuffer[i].pvBuffer, messageBuffer[i].cbBuffer);
diff --git a/Swiften/SASL/WindowsGSSAPIClientAuthenticator.cpp b/Swiften/SASL/WindowsGSSAPIClientAuthenticator.cpp
index aae437f..10e8c89 100644
--- a/Swiften/SASL/WindowsGSSAPIClientAuthenticator.cpp
+++ b/Swiften/SASL/WindowsGSSAPIClientAuthenticator.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/SASL/WindowsGSSAPIClientAuthenticator.h>
 
@@ -41,61 +41,61 @@ WindowsGSSAPIClientAuthenticator::~WindowsGSSAPIClientAuthenticator() {
     if (haveCredentialsHandle_) {
         freeCredentialsHandle(&credentialsHandle_);
     }
 }
 
 boost::optional<SafeByteArray> WindowsGSSAPIClientAuthenticator::getResponse() const {
-    SWIFT_LOG(debug) << "response_.size(): " << response_.size() << std::endl;
+    SWIFT_LOG(debug) << "response_.size(): " << response_.size();
     return response_;
 }
 
 bool WindowsGSSAPIClientAuthenticator::setChallenge(const boost::optional<ByteArray>& challengeData) {
     /* Following http://tools.ietf.org/html/rfc4752, https://msdn.microsoft.com/en-us/library/windows/desktop/aa380496%28v=vs.85%29.aspx */
 
     if (step_ == BuildingSecurityContext) {
         buildSecurityContext(challengeData);
     }
     else if (step_ == SecurityLayerNegotiation) {
         if (!challengeData) {
-            SWIFT_LOG(debug) << "Empty message received from the server" << std::endl;
+            SWIFT_LOG(debug) << "Empty message received from the server";
             error_ = true;
             return false;
         }
 
         SafeByteArray challenge;
         errorCode_ = decryptMessage(&contextHandle_, challengeData.get(), challenge);
         if (isError()) {
             return false;
         }
 
         if (challenge.size() != 4) {
-            SWIFT_LOG(debug) << "Token received from the server of incorrect length: " << challenge.size() << std::endl;
+            SWIFT_LOG(debug) << "Token received from the server of incorrect length: " << challenge.size();
             error_ = true;
             return false;
         }
 
         unsigned char* challengePointer = vecptr(challenge);
 
         unsigned char serverSecurityLayer = challengePointer[0];
         if (serverSecurityLayer == 0) {
-            SWIFT_LOG(debug) << "Server supports unknown security layer, assuming no security layer" << std::endl;
+            SWIFT_LOG(debug) << "Server supports unknown security layer, assuming no security layer";
             serverSecurityLayer = SECURITY_LAYER_NONE;
         }
         else if (serverSecurityLayer == SECURITY_LAYER_NONE) {
-            SWIFT_LOG(debug) << "Server supports no security layer" << std::endl;
+            SWIFT_LOG(debug) << "Server supports no security layer";
         }
         else {
-            SWIFT_LOG(debug) << "Server supports security layer" << std::endl;
+            SWIFT_LOG(debug) << "Server supports security layer";
         }
 
         unsigned int serverMaximumBuffer = (challengePointer[1] << 16) |
                         (challengePointer[2] << 8) |
                         (challengePointer[3] << 0);
 
         if ((serverSecurityLayer == SECURITY_LAYER_NONE) && (serverMaximumBuffer != 0)) {
-            SWIFT_LOG(debug) << "Server supports no security layer but has maximum buffer size" << serverMaximumBuffer << std::endl;
+            SWIFT_LOG(debug) << "Server supports no security layer but has maximum buffer size" << serverMaximumBuffer;
             error_ = true;
             return false;
         }
 
         SafeByteArray message(4);
 
@@ -155,13 +155,13 @@ void WindowsGSSAPIClientAuthenticator::buildSecurityContext(const boost::optiona
 
     if (!haveCompleteContext_) {
         return;
     }
 
     if (contextSupported & ISC_REQ_MUTUAL_AUTH == 0) {
-        SWIFT_LOG(debug) << "Mutual authentication not supported" << std::endl;
+        SWIFT_LOG(debug) << "Mutual authentication not supported";
         error_ = true;
         return;
     }
 
     errorCode_ = queryContextAttributes(&contextHandle_, SECPKG_ATTR_SIZES, &sizes_);
     if (isError()) {
@@ -178,20 +178,20 @@ void WindowsGSSAPIClientAuthenticator::buildSecurityContext(const boost::optiona
     errorCode_ = queryContextAttributes(&contextHandle_, SECPKG_ATTR_NAMES, &names);
     if (isError()) {
         return;
     }
 
     userName_ = names.sUserName;
-    SWIFT_LOG(debug) << "User name: " << userName_ << std::endl;
+    SWIFT_LOG(debug) << "User name: " << userName_;
 
     std::size_t position = userName_.find("\\");
     clientName_ = userName_.substr(position + 1);
-    SWIFT_LOG(debug) << "Client name: " << clientName_ << std::endl;
+    SWIFT_LOG(debug) << "Client name: " << clientName_;
 
     serverName_ = userName_.substr(0, position);
-    SWIFT_LOG(debug) << "Server name: " << serverName_ << std::endl;
+    SWIFT_LOG(debug) << "Server name: " << serverName_;
 
     freeContextBuffer(names.sUserName);
     step_ = SecurityLayerNegotiation;
 }
 
 }
diff --git a/Swiften/SASL/WindowsServicePrincipalName.cpp b/Swiften/SASL/WindowsServicePrincipalName.cpp
index 419395c..6c87925 100644
--- a/Swiften/SASL/WindowsServicePrincipalName.cpp
+++ b/Swiften/SASL/WindowsServicePrincipalName.cpp
@@ -61,31 +61,31 @@ std::string WindowsServicePrincipalName::toString() {
             throw std::runtime_error(errorString.str());
         }
 
         firstCall = false;
     }
 
-    SWIFT_LOG(debug) << "SPN: " << str << std::endl;
+    SWIFT_LOG(debug) << "SPN: " << str;
     return str;
 }
 
 DWORD WindowsServicePrincipalName::dsMakeSpn(DWORD* length, wchar_t* value) {
     DWORD status;
 
 #ifdef UNICODE
-    SWIFT_LOG(debug) << "UNICODE is defined" << std::endl;
+    SWIFT_LOG(debug) << "UNICODE is defined";
 #else
-    SWIFT_LOG(debug) << "UNICODE is not defined" << std::endl;
+    SWIFT_LOG(debug) << "UNICODE is not defined";
 #endif
 
-    SWIFT_LOG(debug) << "serviceClass_: " << convertWStringToString(serviceClass_.c_str()) << std::endl;
-    SWIFT_LOG(debug) << "serviceName_: " << convertWStringToString(serviceName_.c_str()) << std::endl;
-    SWIFT_LOG(debug) << "instanceName_: " << convertWStringToString(instanceName_.c_str()) << std::endl;
-    SWIFT_LOG(debug) << "referrer_: " << convertWStringToString(referrer_.c_str()) << std::endl;
-    SWIFT_LOG(debug) << "instancePort_: " << instancePort_ << std::endl;
-    SWIFT_LOG(debug) << "length: " << *length << std::endl;
+    SWIFT_LOG(debug) << "serviceClass_: " << convertWStringToString(serviceClass_.c_str());
+    SWIFT_LOG(debug) << "serviceName_: " << convertWStringToString(serviceName_.c_str());
+    SWIFT_LOG(debug) << "instanceName_: " << convertWStringToString(instanceName_.c_str());
+    SWIFT_LOG(debug) << "referrer_: " << convertWStringToString(referrer_.c_str());
+    SWIFT_LOG(debug) << "instancePort_: " << instancePort_;
+    SWIFT_LOG(debug) << "length: " << *length;
 
     /* Call the Unicode function because that is recommended:
 https://msdn.microsoft.com/en-us/library/windows/desktop/ff381407%28v=vs.85%29.aspx */
     status =  DsMakeSpnW(
             serviceClass_.c_str(),
             serviceName_.c_str(),
@@ -94,13 +94,13 @@ https://msdn.microsoft.com/en-us/library/windows/desktop/ff381407%28v=vs.85%29.a
             referrer_.empty() ? NULL : referrer_.c_str(),
             length,
             value);
     if (status != ERROR_SUCCESS) {
         boost::system::error_code errorCode(status, boost::system::system_category());
 
-        SWIFT_LOG(debug) << std::hex << "status: 0x" << status << ": " << errorCode.message() << std::endl;
+        SWIFT_LOG(debug) << std::hex << "status: 0x" << status << ": " << errorCode.message();
     }
 
     return status;
 }
 
 }
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/SASL
parent	697ae6ae84512a744958b24118197ec7bfdbc1f0 (diff)
download	swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.zip swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.tar.bz2