Fixed conversion warnings on framework tests

CMakeLists.txt

@@ -29,6 +29,7 @@ if (NOT BUILD_TESTING)
     add_compile_options(
         -Wshadow
         -pedantic
+        -Wconversion
     )
 endif()
 

Drv/Ip/TcpClientSocket.cpp

@@ -82,11 +82,11 @@
 }
 
 I32 TcpClientSocket::sendProtocol(const U8* const data, const U32 size) {
-    return ::send(this->m_fd, data, size, SOCKET_IP_SEND_FLAGS);
+    return static_cast<I32>(::send(this->m_fd, data, size, SOCKET_IP_SEND_FLAGS));
 }
 
 I32 TcpClientSocket::recvProtocol(U8* const data, const U32 size) {
-    return ::recv(this->m_fd, data, size, SOCKET_IP_RECV_FLAGS);
+    return static_cast<I32>(::recv(this->m_fd, data, size, SOCKET_IP_RECV_FLAGS));
 }
 
 }  // namespace Drv

Drv/Ip/TcpServerSocket.cpp

@@ -120,11 +120,11 @@
 }
 
 I32 TcpServerSocket::sendProtocol(const U8* const data, const U32 size) {
-    return ::send(this->m_fd, data, size, SOCKET_IP_SEND_FLAGS);
+    return static_cast<I32>(::send(this->m_fd, data, size, SOCKET_IP_SEND_FLAGS));
 }
 
 I32 TcpServerSocket::recvProtocol(U8* const data, const U32 size) {
-    return ::recv(this->m_fd, data, size, SOCKET_IP_RECV_FLAGS);
+    return static_cast<I32>(::recv(this->m_fd, data, size, SOCKET_IP_RECV_FLAGS));
 }
 
 }  // namespace Drv

Drv/Ip/UdpSocket.cpp

@@ -155,13 +155,13 @@
 
 I32 UdpSocket::sendProtocol(const U8* const data, const U32 size) {
     FW_ASSERT(this->m_state->m_addr_send.sin_family != 0); // Make sure the address was previously setup
-    return ::sendto(this->m_fd, data, size, SOCKET_IP_SEND_FLAGS,
-                    reinterpret_cast<struct sockaddr *>(&this->m_state->m_addr_send), sizeof(this->m_state->m_addr_send));
+    return static_cast<I32>(::sendto(this->m_fd, data, size, SOCKET_IP_SEND_FLAGS,
+                    reinterpret_cast<struct sockaddr *>(&this->m_state->m_addr_send), sizeof(this->m_state->m_addr_send)));
 }
 
 I32 UdpSocket::recvProtocol(U8* const data, const U32 size) {
     FW_ASSERT(this->m_state->m_addr_recv.sin_family != 0); // Make sure the address was previously setup
-    return ::recvfrom(this->m_fd, data, size, SOCKET_IP_RECV_FLAGS, nullptr, nullptr);
+    return static_cast<I32>(::recvfrom(this->m_fd, data, size, SOCKET_IP_RECV_FLAGS, nullptr, nullptr));
 }
 
 }  // namespace Drv

Drv/LinuxGpioDriver/LinuxGpioDriverComponentImpl.cpp

@@ -114,7 +114,7 @@
         }
 
         const char *dir = out_flag ? "out" : "in";
-        len = strlen(dir);
+        len = static_cast<int>(strlen(dir));
 
         if (write(fd, dir, len) != len) {
             (void) close(fd);
@@ -157,8 +157,8 @@
 
         FW_ASSERT(fd != -1);
 
-        NATIVE_INT_TYPE stat1 = lseek(fd, 0, SEEK_SET); // Must seek back to the starting
-        NATIVE_INT_TYPE stat2 = read(fd, &ch, 1);
+        NATIVE_INT_TYPE stat1 = static_cast<NATIVE_INT_TYPE>(lseek(fd, 0, SEEK_SET)); // Must seek back to the starting
+        NATIVE_INT_TYPE stat2 = static_cast<NATIVE_INT_TYPE>(read(fd, &ch, 1));
 
         if (stat1 == -1 || stat2 != 1) {
             DEBUG_PRINT("GPIO read failure: %d %d!\n",stat1,stat2);
@@ -199,7 +199,7 @@
             return -1;
         }
 
-        len = strlen(edge) + 1;
+        len = static_cast<int>(strlen(edge) + 1);
         if(write(fd, edge, len) != len) {
             (void) close(fd);
             DEBUG_PRINT("gpio/set-edge error!\n");

Drv/LinuxI2cDriver/LinuxI2cDriver.cpp

@@ -99,7 +99,7 @@ namespace Drv {
       // make sure it isn't a null pointer
       FW_ASSERT(serBuffer.getData());
       // write data
-      stat = write(this->m_fd, serBuffer.getData(), serBuffer.getSize());
+      stat = static_cast<int>(write(this->m_fd, serBuffer.getData(), serBuffer.getSize()));
       if (stat == -1) {
 #if DEBUG_PRINT
           Fw::Logger::logMsg("Status: %d Errno: %d\n", stat, errno);
@@ -135,7 +135,7 @@ namespace Drv {
       // make sure it isn't a null pointer
       FW_ASSERT(serBuffer.getData());
       // read data
-      stat = read(this->m_fd, serBuffer.getData(), serBuffer.getSize());
+      stat = static_cast<int>(read(this->m_fd, serBuffer.getData(), serBuffer.getSize()));
       if (stat == -1) {
 #if DEBUG_PRINT
           Fw::Logger::logMsg("Status: %d Errno: %d\n", stat, errno);

Drv/LinuxUartDriver/LinuxUartDriver.cpp

@@ -326,7 +326,7 @@
         unsigned char *data = serBuffer.getData();
         NATIVE_INT_TYPE xferSize = serBuffer.getSize();
 
-        NATIVE_INT_TYPE stat = ::write(this->m_fd, data, xferSize);
+        NATIVE_INT_TYPE stat = static_cast<NATIVE_INT_TYPE>(::write(this->m_fd, data, xferSize));
 
         if (-1 == stat || stat != xferSize) {
           Fw::LogStringArg _arg = this->m_device;
@@ -368,7 +368,7 @@
         // Read until something is received or an error occurs. Only loop when
         // stat == 0 as this is the timeout condition and the read should spin
         while ((stat == 0) && !comp->m_quitReadThread) {
-            stat = ::read(comp->m_fd, buff.getData(), buff.getSize());
+            stat = static_cast<int>(::read(comp->m_fd, buff.getData(), buff.getSize()));
         }
         buff.setSize(0);
 

Fw/Dp/DpContainer.cpp

@@ -139,7 +139,7 @@ void DpContainer::setBuffer(const Buffer& buffer) {
     FW_ASSERT(bufferSize >= minBufferSize, static_cast<FwAssertArgType>(bufferSize),
               static_cast<FwAssertArgType>(minBufferSize));
     U8* const dataAddr = &buffAddr[DATA_OFFSET];
-    this->m_dataBuffer.setExtBuffer(dataAddr, dataCapacity);
+    this->m_dataBuffer.setExtBuffer(dataAddr, static_cast<Fw::Serializable::SizeType>(dataCapacity));
 }
 
 Utils::HashBuffer DpContainer::getHeaderHash() const {
@@ -199,7 +199,7 @@ Utils::HashBuffer DpContainer::computeDataHash() const {
     FW_ASSERT(DATA_OFFSET + dataSize <= bufferSize, static_cast<FwAssertArgType>(DATA_OFFSET + dataSize),
               static_cast<FwAssertArgType>(bufferSize));
     Utils::HashBuffer computedHash;
-    Utils::Hash::hash(dataAddr, dataSize, computedHash);
+    Utils::Hash::hash(dataAddr, static_cast<NATIVE_INT_TYPE>(dataSize), computedHash);
     return computedHash;
 }
 

Fw/FilePacket/DataPacket.cpp

@@ -32,11 +32,11 @@ namespace Fw {
   U32 FilePacket::DataPacket ::
     bufferSize() const
   {
-    return
+    return static_cast<U32>(
       this->m_header.bufferSize() +
       sizeof(this->m_byteOffset) +
       sizeof(this->m_dataSize) +
-      this->m_dataSize;
+      this->m_dataSize);
   }
 
   SerializeStatus FilePacket::DataPacket ::
@@ -76,10 +76,10 @@ namespace Fw {
   U32 FilePacket::DataPacket ::
     fixedLengthSize() const
   {
-    return
+    return static_cast<U32>(
       this->m_header.bufferSize() +
       sizeof(this->m_byteOffset) +
-      sizeof(this->m_dataSize);
+      sizeof(this->m_dataSize));
   }
 
   SerializeStatus FilePacket::DataPacket ::

Fw/FilePacket/EndPacket.cpp

@@ -30,7 +30,7 @@ namespace Fw {
   U32 FilePacket::EndPacket ::
     bufferSize() const
   {
-    return this->m_header.bufferSize() + sizeof(this->m_checksumValue);
+    return static_cast<U32>(this->m_header.bufferSize() + sizeof(this->m_checksumValue));
   }
 
   SerializeStatus FilePacket::EndPacket ::

Fw/FilePacket/PathName.cpp

@@ -29,7 +29,7 @@ namespace Fw {
   U32 FilePacket::PathName ::
     bufferSize() const
   {
-    return sizeof(this->m_length) + this->m_length;
+    return static_cast<U32>(sizeof(this->m_length) + this->m_length);
   }
 
   SerializeStatus FilePacket::PathName ::

Fw/FilePacket/StartPacket.cpp

@@ -31,10 +31,11 @@ namespace Fw {
   U32 FilePacket::StartPacket ::
     bufferSize() const
   {
-    return this->m_header.bufferSize() +
+    return static_cast<U32>(
+      this->m_header.bufferSize() +
       sizeof(this->m_fileSize) +
       this->m_sourcePath.bufferSize() +
-      this->m_destinationPath.bufferSize();
+      this->m_destinationPath.bufferSize());
   }
 
   SerializeStatus FilePacket::StartPacket ::

Fw/Types/Assert.cpp

@@ -34,12 +34,17 @@
 
         switch (numArgs) {
             case 0:
-                (void) snprintf(destBuffer, buffSize, fileIdFs, file, lineNo);
+                (void) snprintf(
+                    destBuffer,
+                    static_cast<size_t>(buffSize),
+                    fileIdFs,
+                    file,
+                    lineNo);
                 break;
             case 1:
                 (void) snprintf(
                     destBuffer,
-                    buffSize,
+                    static_cast<size_t>(buffSize),
                     fileIdFs " %" PRI_FwAssertArgType,
                     file,
                     lineNo,
@@ -49,7 +54,7 @@
             case 2:
                 (void) snprintf(
                     destBuffer,
-                    buffSize,
+                    static_cast<size_t>(buffSize),
                     fileIdFs " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType,
                     file,
                     lineNo,
@@ -59,7 +64,7 @@
             case 3:
                 (void) snprintf(
                     destBuffer,
-                    buffSize,
+                    static_cast<size_t>(buffSize),
                     fileIdFs " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType
                       " %" PRI_FwAssertArgType,
                     file,
@@ -70,7 +75,7 @@
             case 4:
                 (void) snprintf(
                     destBuffer,
-                    buffSize,
+                    static_cast<size_t>(buffSize),
                     fileIdFs " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType
                       " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType,
                     file,
@@ -80,7 +85,7 @@
             case 5:
                 (void) snprintf(
                     destBuffer,
-                    buffSize,
+                    static_cast<size_t>(buffSize),
                     fileIdFs " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType
                       " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType
                       " %" PRI_FwAssertArgType,
@@ -92,7 +97,7 @@
             case 6:
                 (void) snprintf(
                     destBuffer,
-                    buffSize,
+                    static_cast<size_t>(buffSize),
                     fileIdFs " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType
                       " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType
                       " %" PRI_FwAssertArgType " %" PRI_FwAssertArgType,