1 files changed, 12 insertions, 12 deletions
diff --git a/Swiften/FileTransfer/SOCKS5BytestreamServerSession.cpp b/Swiften/FileTransfer/SOCKS5BytestreamServerSession.cpp
index 0fd40bf..a4ab751 100644
--- a/Swiften/FileTransfer/SOCKS5BytestreamServerSession.cpp
+++ b/Swiften/FileTransfer/SOCKS5BytestreamServerSession.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2010-2018 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/FileTransfer/SOCKS5BytestreamServerSession.h>
 
@@ -30,42 +30,42 @@ SOCKS5BytestreamServerSession::SOCKS5BytestreamServerSession(
             waitingForData(false) {
     disconnectedConnection = connection->onDisconnected.connect(boost::bind(&SOCKS5BytestreamServerSession::handleDisconnected, this, _1));
 }
 
 SOCKS5BytestreamServerSession::~SOCKS5BytestreamServerSession() {
     if (state != Finished && state != Initial) {
-        SWIFT_LOG(warning) << "SOCKS5BytestreamServerSession unfinished" << std::endl;
+        SWIFT_LOG(warning) << "SOCKS5BytestreamServerSession unfinished";
         finish();
     }
 }
 
 void SOCKS5BytestreamServerSession::start() {
-    SWIFT_LOG(debug) << std::endl;
+    SWIFT_LOG(debug);
     dataReadConnection = connection->onDataRead.connect(
             boost::bind(&SOCKS5BytestreamServerSession::handleDataRead, this, _1));
     state = WaitingForAuthentication;
 }
 
 void SOCKS5BytestreamServerSession::stop() {
     finish();
 }
 
 void SOCKS5BytestreamServerSession::startSending(std::shared_ptr<ReadBytestream> stream) {
-    if (state != ReadyForTransfer) { SWIFT_LOG(debug) << "Not ready for transfer!" << std::endl; return; }
+    if (state != ReadyForTransfer) { SWIFT_LOG(debug) << "Not ready for transfer!"; return; }
 
     readBytestream = stream;
     state = WritingData;
     dataAvailableConnection = readBytestream->onDataAvailable.connect(
             boost::bind(&SOCKS5BytestreamServerSession::handleDataAvailable, this));
     dataWrittenConnection = connection->onDataWritten.connect(
             boost::bind(&SOCKS5BytestreamServerSession::sendData, this));
     sendData();
 }
 
 void SOCKS5BytestreamServerSession::startReceiving(std::shared_ptr<WriteBytestream> stream) {
-    if (state != ReadyForTransfer) { SWIFT_LOG(debug) << "Not ready for transfer!" << std::endl; return; }
+    if (state != ReadyForTransfer) { SWIFT_LOG(debug) << "Not ready for transfer!"; return; }
 
     writeBytestream = stream;
     state = ReadingData;
     writeBytestream->write(unprocessedData);
     // onBytesReceived(unprocessedData.size());
     unprocessedData.clear();
@@ -90,13 +90,13 @@ void SOCKS5BytestreamServerSession::handleDataAvailable() {
     if (waitingForData) {
         sendData();
     }
 }
 
 void SOCKS5BytestreamServerSession::handleDisconnected(const boost::optional<Connection::Error>& error) {
-    SWIFT_LOG(debug) << (error ? (error == Connection::ReadError ? "Read Error" : "Write Error") : "No Error") << std::endl;
+    SWIFT_LOG(debug) << (error ? (error == Connection::ReadError ? "Read Error" : "Write Error") : "No Error");
     finish(error ? boost::optional<FileTransferError>(FileTransferError::PeerError) : boost::optional<FileTransferError>());
 }
 
 void SOCKS5BytestreamServerSession::process() {
     if (state == WaitingForAuthentication) {
         if (unprocessedData.size() >= 2) {
@@ -106,13 +106,13 @@ void SOCKS5BytestreamServerSession::process() {
                 // Skip authentication mechanism
                 ++i;
             }
             if (i == 2 + authCount) {
                 // Authentication message is complete
                 if (i != unprocessedData.size()) {
-                    SWIFT_LOG(debug) << "Junk after authentication mechanism" << std::endl;
+                    SWIFT_LOG(debug) << "Junk after authentication mechanism";
                 }
                 unprocessedData.clear();
                 connection->write(createSafeByteArray("\x05\x00", 2));
                 state = WaitingForRequest;
             }
         }
@@ -127,36 +127,36 @@ void SOCKS5BytestreamServerSession::process() {
                 ++i;
             }
             // Skip the port: 2 byte large, one already skipped. Add one for comparison with size
             i += 2;
             if (i <= unprocessedData.size()) {
                 if (i != unprocessedData.size()) {
-                    SWIFT_LOG(debug) << "Junk after authentication mechanism" << std::endl;
+                    SWIFT_LOG(debug) << "Junk after authentication mechanism";
                 }
                 unprocessedData.clear();
                 streamID = byteArrayToString(requestID);
                 bool hasBytestream = bytestreams->hasBytestream(streamID);
                 SafeByteArray result = createSafeByteArray("\x05", 1);
                 result.push_back(hasBytestream ? 0x0 : 0x4);
                 append(result, createByteArray("\x00\x03", 2));
                 try {
                     result.push_back(boost::numeric_cast<unsigned char>(requestID.size()));
                 }
                 catch (const boost::numeric::bad_numeric_cast& e) {
-                    SWIFT_LOG(warning) << "SOCKS5 request ID is too long (" << requestID.size() << "): " << e.what() << std::endl;
+                    SWIFT_LOG(warning) << "SOCKS5 request ID is too long (" << requestID.size() << "): " << e.what();
                     finish();
                     return;
                 }
                 append(result, concat(requestID, createByteArray("\x00\x00", 2)));
                 if (!hasBytestream) {
-                    SWIFT_LOG(debug) << "Readstream or Wrtiestream with ID " << streamID << " not found!" << std::endl;
+                    SWIFT_LOG(debug) << "Readstream or Wrtiestream with ID " << streamID << " not found!";
                     connection->write(result);
                     finish(boost::optional<FileTransferError>(FileTransferError::PeerError));
                 }
                 else {
-                    SWIFT_LOG(debug) << "Found stream. Sent OK." << std::endl;
+                    SWIFT_LOG(debug) << "Found stream. Sent OK.";
                     connection->write(result);
                     state = ReadyForTransfer;
                 }
             }
         }
     }
@@ -182,13 +182,13 @@ void SOCKS5BytestreamServerSession::sendData() {
     else {
         finish();
     }
 }
 
 void SOCKS5BytestreamServerSession::finish(const boost::optional<FileTransferError>& error) {
-    SWIFT_LOG(debug) << "state: " << state << std::endl;
+    SWIFT_LOG(debug) << "state: " << state;
     if (state == Finished) {
         return;
     }
 
     disconnectedConnection.disconnect();
     dataReadConnection.disconnect();