Fix string formatting in MB debug messages to avoid warnings

The problem is that size_t is not a %d in printf command. This
produces a warnings which are treated as errors.
Was replaced with %zu

5 files changed, 31 insertions, 31 deletions

diff --git a/src/3rd_party-static/message_broker/src/client/mb_controller.cpp b/src/3rd_party-static/message_broker/src/client/mb_controller.cpp
index 8a4a77cf30..dde2290bb6 100644
--- a/src/3rd_party-static/message_broker/src/client/mb_controller.cpp
+++ b/src/3rd_party-static/message_broker/src/client/mb_controller.cpp
@@ -6,7 +6,7 @@
 
 #include "mb_controller.hpp"
 
-#include "MBDebugHelper.h" 
+#include "MBDebugHelper.h"
 #include "CMessageBroker.hpp"
 
 namespace NsMessageBroker
@@ -45,7 +45,7 @@ namespace NsMessageBroker
             return recv;
          }
          std::string wmes = m_receiverWriter.write(root);
-         DBG_MSG(("Parsed JSON string:%s; length: %d\n", wmes.c_str(), wmes.length()));
+         DBG_MSG(("Parsed JSON string:%s; length: %zu\n", wmes.c_str(), wmes.length()));
          DBG_MSG(("Buffer is:%s\n", m_receivingBuffer.c_str()));
          ssize_t beginpos = m_receivingBuffer.find(wmes);
          if (-1 != beginpos)
@@ -125,7 +125,7 @@ namespace NsMessageBroker
       }
       int bytesSent = Send(mes);
       bytesSent = bytesSent; // to prevent compiler warnings in case DBG_MSG off
-      DBG_MSG(("Length:%d, Sent: %d bytes\n", mes.length(), bytesSent));
+      DBG_MSG(("Length: %zu, Sent: %d bytes\n", mes.length(), bytesSent));
    }
 
    std::string CMessageBrokerController::findMethodById(std::string id)
@@ -153,7 +153,7 @@ namespace NsMessageBroker
          return mControllersIdCurrent = mControllersIdStart;
       }
    }
-   
+
    void CMessageBrokerController::prepareMessage(Json::Value& root)
    {
       root["jsonrpc"] = "2.0";
@@ -286,11 +286,11 @@ namespace NsMessageBroker
    {
       DBG_MSG(("CMessageBrokerController::checkMessage()\n"));
       Json::Value err;
-   
+
       try
       {
          /* check the JSON-RPC version => 2.0 */
-         if (!root.isObject() || !root.isMember("jsonrpc") || root["jsonrpc"] != "2.0") 
+         if (!root.isObject() || !root.isMember("jsonrpc") || root["jsonrpc"] != "2.0")
          {
             error["id"] = Json::Value::null;
             error["jsonrpc"] = "2.0";
diff --git a/src/3rd_party-static/message_broker/src/lib_messagebroker/CMessageBroker.cpp b/src/3rd_party-static/message_broker/src/lib_messagebroker/CMessageBroker.cpp
index 3b14489a8c..3749a249dd 100644
--- a/src/3rd_party-static/message_broker/src/lib_messagebroker/CMessageBroker.cpp
+++ b/src/3rd_party-static/message_broker/src/lib_messagebroker/CMessageBroker.cpp
@@ -444,13 +444,13 @@ void CMessageBroker::onMessageReceived(int fd, std::string& aJSONData, bool tryH
   while (! aJSONData.empty()) {
     Json::Value root;
     if ((! p->m_reader.parse(aJSONData, root)) || root.isNull()) {
-      DBG_MSG_ERROR(("Unable to parse JSON!"));
+      DBG_MSG_ERROR(("Unable to parse JSON!\n"));
       if (! tryHard) {
         return;
       }
       uint8_t first_byte = static_cast<uint8_t>(aJSONData[0]);
       if ((first_byte <= 0x08) || ((first_byte >= 0x80) && (first_byte <= 0x88))) {
-        DBG_MSG((" There is an unparsed websocket header probably.\n"));
+        DBG_MSG(("There is an unparsed websocket header probably.\n"));
         /* Websocket headers can have FIN flag set in the first byte (0x80).
          * Then there are 3 zero bits and 4 bits for opcode (from 0x00 to 0x0A).
          * But actually we don't use opcodes above 0x08.
@@ -505,7 +505,7 @@ void CMessageBroker::Test() {
       return;
     }
     std::string wmes = p->m_recieverWriter.write(root);
-    DBG_MSG(("Parsed JSON string:%s; length: %d\n", wmes.c_str(), wmes.length()));
+    DBG_MSG(("Parsed JSON string:%s; length: %zu\n", wmes.c_str(), wmes.length()));
     DBG_MSG(("Buffer is:%s\n", ReceivingBuffer.c_str()));
     ssize_t beginpos = ReceivingBuffer.find(wmes);
     ReceivingBuffer.erase(0, beginpos + wmes.length());
@@ -853,7 +853,7 @@ void CMessageBroker_Private::sendJsonMessage(int fd, Json::Value message) {
       DBG_MSG_ERROR(("Message hasn't been sent!\n"));
       return;
     }
-    DBG_MSG(("Length:%d, Sent: %d bytes\n", mes.length(), retVal));
+    DBG_MSG(("Length: %zu, Sent: %d bytes\n", mes.length(), retVal));
   } else {
     DBG_MSG_ERROR(("mpSender NULL pointer\n"));
   }
diff --git a/src/3rd_party-static/message_broker/src/lib_messagebroker/CMessageBrokerRegistry.cpp b/src/3rd_party-static/message_broker/src/lib_messagebroker/CMessageBrokerRegistry.cpp
index fb24d08f1c..e32145058f 100644
--- a/src/3rd_party-static/message_broker/src/lib_messagebroker/CMessageBrokerRegistry.cpp
+++ b/src/3rd_party-static/message_broker/src/lib_messagebroker/CMessageBrokerRegistry.cpp
@@ -10,7 +10,7 @@
 #include <vector>
 #include <string>
 
-namespace NsMessageBroker 
+namespace NsMessageBroker
 {
    CMessageBrokerRegistry::CMessageBrokerRegistry()
    {
@@ -43,7 +43,7 @@ namespace NsMessageBroker
          DBG_MSG(("Controller already exists!\n"));
       }
 
-      DBG_MSG(("Count of controllers: %d\n", mControllersList.size()));
+      DBG_MSG(("Count of controllers: %zu\n", mControllersList.size()));
       return result;
    }
 
@@ -64,7 +64,7 @@ namespace NsMessageBroker
             DBG_MSG(("No such controller in the list!\n"));
             return;
          }
-         DBG_MSG(("Count of controllers: %d\n", mControllersList.size()));
+         DBG_MSG(("Count of controllers: %zu\n", mControllersList.size()));
       }
       removeSubscribersByDescriptor(fd);
    }
@@ -124,7 +124,7 @@ namespace NsMessageBroker
          mSubscribersList.insert(std::map <std::string, int>::value_type(name, fd));
       }
 
-      DBG_MSG(("Count of subscribers: %d\n", mSubscribersList.size()));
+      DBG_MSG(("Count of subscribers: %zu\n", mSubscribersList.size()));
       return result;
    }
 
@@ -146,7 +146,7 @@ namespace NsMessageBroker
            }
        }
 
-       DBG_MSG(("Count of subscribers: %d\n", mSubscribersList.size()));
+       DBG_MSG(("Count of subscribers: %zu\n", mSubscribersList.size()));
    }
 
    int CMessageBrokerRegistry::getDestinationFd(std::string name)
diff --git a/src/3rd_party-static/message_broker/src/lib_messagebroker/websocket_handler.cpp b/src/3rd_party-static/message_broker/src/lib_messagebroker/websocket_handler.cpp
index 7d3890b7a8..17c2dd92ae 100644
--- a/src/3rd_party-static/message_broker/src/lib_messagebroker/websocket_handler.cpp
+++ b/src/3rd_party-static/message_broker/src/lib_messagebroker/websocket_handler.cpp
@@ -19,7 +19,7 @@
 #include "libMBDebugHelper.h"
 #include "md5.h"
 
-namespace NsMessageBroker 
+namespace NsMessageBroker
 {
 
    unsigned int CWebSocketHandler::parseWebSocketDataLength(
@@ -576,43 +576,43 @@ namespace NsMessageBroker
 
       return 0;
    }
-   
+
    rawBytes CWebSocketHandler::handshake_hybi00(const std::string &key1, const std::string &key2, const rawBytes &key3)
    {
       if (key3.size() < 8)
       {
-         DBG_MSG_ERROR(("key3's size is %d, less than 8 bytes\n", key3.size()));
+         DBG_MSG_ERROR(("key3's size is %zu, less than 8 bytes\n", key3.size()));
          return rawBytes();
       }
-      
+
       unsigned long number1 = extractNumber(key1);
       unsigned long number2 = extractNumber(key2);
       DBG_MSG(("number1 is %ld, number2 is %ld\n", number1, number2));
-      
+
       if ((number1 == 0) || (number2 == 0))
       {
          return rawBytes();
       }
-      
+
       // represent the numbers in big-endian format (network-byte order)
       unsigned long bigEndianNumber1 = htonl(number1);
       unsigned long bigEndianNumber2 = htonl(number2);
-      
+
       // the temporary key consists of bytes of the first and second numbers
       // and the key3
       rawBytes key(8);
       memcpy(&key[0], &bigEndianNumber1, 4);
       memcpy(&key[4], &bigEndianNumber2, 4);
       key.insert(key.end(), key3.begin(), key3.begin() + 8);
-      
+
       MD5 md5(std::string(key.begin(), key.end()));
       char digest[16];
       md5.getdigest(digest);
       rawBytes resultBytes(&digest[0], &digest[16]);
-      
+
       return resultBytes;
    }
-   
+
    unsigned long CWebSocketHandler::extractNumber(const std::string &key) const
    {
       // leave digits only
@@ -631,9 +631,9 @@ namespace NsMessageBroker
             keyDigits += keyChar;
          }
       }
-      
+
       unsigned long result = 0;
-      
+
       // convert string to number
       long long numberKey;
       if (std::stringstream(keyDigits) >> numberKey)
@@ -659,9 +659,9 @@ namespace NsMessageBroker
       {
          // couldn't convert
       }
-      
+
       return result;
    }
-   
+
 } /* namespace NsMessageBroker */
 
diff --git a/src/3rd_party-static/message_broker/src/server/mb_tcpserver.cpp b/src/3rd_party-static/message_broker/src/server/mb_tcpserver.cpp
index bdd7b2bfdf..bd8fa341b0 100644
--- a/src/3rd_party-static/message_broker/src/server/mb_tcpserver.cpp
+++ b/src/3rd_party-static/message_broker/src/server/mb_tcpserver.cpp
@@ -64,7 +64,7 @@ bool TcpServer::Recv(int fd) {
 
   std::vector<char> buf;
   buf.reserve(RECV_BUFFER_LENGTH + pReceivingBuffer->size());
-  DBG_MSG(("Left in  pReceivingBuffer: %d \n",
+  DBG_MSG(("Left in  pReceivingBuffer: %zu\n",
            pReceivingBuffer->size()));
   buf.assign(pReceivingBuffer->c_str(),
              pReceivingBuffer->c_str() + pReceivingBuffer->size());
@@ -102,7 +102,7 @@ bool TcpServer::Recv(int fd) {
     }
 
     *pReceivingBuffer = std::string(&buf[0], nb);
-    DBG_MSG(("pReceivingBuffer before onMessageReceived:%d : %s\n",
+    DBG_MSG(("pReceivingBuffer before onMessageReceived: %zu: %s\n",
              pReceivingBuffer->size(), pReceivingBuffer->c_str()));
 
     // we need to check for websocket handshake