Fix pedantic warnings (#2441)

* Fix macro pedantic warning

* Fixed pedantic warnings

CMakeLists.txt

@@ -20,6 +20,7 @@ add_compile_options(
     -Wall
     -Wextra
     -Werror
+#    -pedantic
     $<$<COMPILE_LANGUAGE:CXX>:-Wold-style-cast>
     -Wno-unused-parameter
 )

Drv/Ip/SocketReadTask.cpp

@@ -111,4 +111,4 @@ void SocketReadTask::readTask(void* pointer) {
            (status == SOCK_SUCCESS || status == SOCK_INTERRUPTED_TRY_AGAIN || self->m_reconnect));
     self->getSocketHandler().shutdown(); // Shutdown the port entirely
 }
-};  // namespace Drv
+}  // namespace Drv

Drv/Ip/SocketReadTask.hpp

@@ -173,5 +173,5 @@ class SocketReadTask {
     bool m_stop; //!< Stops the task when set to true
 
 };
-};
+}
 #endif  // DRV_SOCKETREADTASK_HPP

Drv/LinuxGpioDriver/LinuxGpioDriverComponentImpl.cpp

@@ -27,8 +27,8 @@
 #include <fcntl.h>
 #include <poll.h>
 
-//#define DEBUG_PRINT(x,...) printf(x,##__VA_ARGS__); fflush(stdout)
-#define DEBUG_PRINT(x,...)
+//#define DEBUG_PRINT(...) printf(##__VA_ARGS__); fflush(stdout)
+#define DEBUG_PRINT(...)
 
 namespace Drv {
 

Drv/LinuxI2cDriver/LinuxI2cDriver.cpp

@@ -174,25 +174,23 @@ namespace Drv {
       Fw::Logger::logMsg("I2c addr: 0x%02X\n",addr);
     #endif
 
-    struct i2c_msg rdwr_msgs[2] = {
-        {  // Start address
-            .addr = static_cast<U16>(addr),
-            .flags = 0, // write
-            .len = static_cast<U16>(writeBuffer.getSize()),
-            .buf = writeBuffer.getData()
-        },
-        { // Read buffer
-            .addr = static_cast<U16>(addr),
-            .flags = I2C_M_RD, // read
-            .len = static_cast<U16>(readBuffer.getSize()),
-            .buf = readBuffer.getData()
-        }
-    };
-
-    struct i2c_rdwr_ioctl_data rdwr_data = {
-        .msgs = rdwr_msgs,
-        .nmsgs = 2
-    };
+    struct i2c_msg rdwr_msgs[2];
+
+    // Start address
+    rdwr_msgs[0].addr = static_cast<U16>(addr);
+    rdwr_msgs[0].flags = 0; // write
+    rdwr_msgs[0].len = static_cast<U16>(writeBuffer.getSize());
+    rdwr_msgs[0].buf = writeBuffer.getData();
+
+    // Read buffer
+    rdwr_msgs[1].addr = static_cast<U16>(addr);
+    rdwr_msgs[1].flags = I2C_M_RD; // read
+    rdwr_msgs[1].len = static_cast<U16>(readBuffer.getSize());
+    rdwr_msgs[1].buf = readBuffer.getData();
+
+    struct i2c_rdwr_ioctl_data rdwr_data;
+    rdwr_data.msgs = rdwr_msgs;
+    rdwr_data.nmsgs = 2;
 
     //Use ioctl to perform the combined write/read transaction
     NATIVE_INT_TYPE stat = ioctl(this->m_fd, I2C_RDWR, &rdwr_data);

Drv/LinuxSpiDriver/LinuxSpiDriverComponentImpl.cpp

@@ -24,8 +24,8 @@
 #include <linux/spi/spidev.h>
 #include <cerrno>
 
-//#define DEBUG_PRINT(x,...) printf(x,##__VA_ARGS__); fflush(stdout)
-#define DEBUG_PRINT(x,...)
+//#define DEBUG_PRINT(...) printf(##__VA_ARGS__); fflush(stdout)
+#define DEBUG_PRINT(...)
 
 namespace Drv {
 

Drv/LinuxUartDriver/LinuxUartDriver.cpp

@@ -22,8 +22,8 @@
 
 //#include <cstdlib>
 //#include <cstdio>
-//#define DEBUG_PRINT(x,...) printf(x,##__VA_ARGS__); fflush(stdout)
-#define DEBUG_PRINT(x, ...)
+//#define DEBUG_PRINT(...) printf(##__VA_ARGS__); fflush(stdout)
+#define DEBUG_PRINT(...)
 
 namespace Drv {
 

Fw/Comp/ActiveComponentBase.cpp

@@ -4,8 +4,8 @@
 #include <Os/TaskString.hpp>
 #include <cstdio>
 
-//#define DEBUG_PRINT(x,...) printf(x,##__VA_ARGS__); fflush(stdout)
-#define DEBUG_PRINT(x,...)
+//#define DEBUG_PRINT(...) printf(##__VA_ARGS__); fflush(stdout)
+#define DEBUG_PRINT(...)
 
 namespace Fw {
 

Fw/Logger/Logger.cpp

@@ -31,5 +31,4 @@ namespace Fw {
     Logger::~Logger() {
     }
 
-};
-//End namespace Fw
+} //End namespace Fw

Fw/Types/BasicTypes.hpp

@@ -12,7 +12,7 @@
 // Use C linkage for the basic items
 extern "C" {
 #include "BasicTypes.h"
-};
+}
 
 #ifndef FW_BASIC_TYPES_HPP
 #define FW_BASIC_TYPES_HPP

Os/Linux/File.cpp

@@ -21,8 +21,8 @@ extern "C" {
 #include <cstring>
 #include <cstdio>
 
-//#define DEBUG_PRINT(x,...) printf(x,##__VA_ARGS__); fflush(stdout)
-#define DEBUG_PRINT(x,...)
+//#define DEBUG_PRINT(...) printf(##__VA_ARGS__); fflush(stdout)
+#define DEBUG_PRINT(...)
 
 namespace Os {
 

Os/Linux/SystemResources.cpp

@@ -68,7 +68,7 @@ namespace Os {
 
     SystemResources::SystemResourcesStatus parseCpuData(char proc_stat_line[LINE_SIZE],
                                                     U32 cpu_data[4]) {
-        if (sscanf(proc_stat_line, "%*s %d %d %d %d", &cpu_data[0], &cpu_data[1], &cpu_data[2], &cpu_data[3]) !=
+        if (sscanf(proc_stat_line, "%*s %u %u %u %u", &cpu_data[0], &cpu_data[1], &cpu_data[2], &cpu_data[3]) !=
             4) {
             return SystemResources::SYSTEM_RESOURCES_ERROR;
         }

Os/ValidatedFile.hpp

@@ -65,6 +65,6 @@ namespace Os {
       Utils::HashBuffer hashBuffer;
   };
 
-};
+}
 
 #endif

Ref/CMakeLists.txt

@@ -56,6 +56,7 @@ register_fprime_deployment()
 target_compile_options("${PROJECT_NAME}" PUBLIC -Wall)
 target_compile_options("${PROJECT_NAME}" PUBLIC -Wextra)
 target_compile_options("${PROJECT_NAME}" PUBLIC -Werror)
+target_compile_options("${PROJECT_NAME}" PUBLIC -pedantic)
 #target_compile_options("${PROJECT_NAME}" PUBLIC -Wshadow)
 target_compile_options("${PROJECT_NAME}" PUBLIC -Wconversion)
 target_compile_options("${PROJECT_NAME}" PUBLIC -Wsign-conversion)

Svc/BufferLogger/BufferLogger.cpp

@@ -157,4 +157,4 @@ namespace Svc {
     }
   }
 
-};
+}

Svc/CmdSequencer/Sequence.cpp

@@ -20,7 +20,7 @@ namespace Svc {
         m_allocatorId(0)
     {
 
-    };
+    }
 
     CmdSequencerComponentImpl::Sequence ::
       ~Sequence()

Svc/ComLogger/ComLogger.cpp

@@ -290,4 +290,4 @@ namespace Svc {
       this->log_WARNING_LO_FileValidationError(logStringArg1, logStringArg2, validateStatus);
     }
   }
-};
+}

Svc/ComLogger/ComLogger.hpp

@@ -152,6 +152,6 @@ namespace Svc {
       void writeHashFile(
       );
   };
-};
+}
 
 #endif

Svc/ComSplitter/ComSplitter.cpp

@@ -57,4 +57,4 @@ namespace Svc {
     }
   }
 
-};
+}

Svc/ComSplitter/ComSplitter.hpp

@@ -48,6 +48,6 @@ namespace Svc {
 
     };
 
-};
+}
 
 #endif

Svc/FramingProtocol/DeframingProtocol.cpp

@@ -22,4 +22,4 @@ void DeframingProtocol::setup(DeframingProtocolInterface& interface) {
     FW_ASSERT(m_interface == nullptr);
     m_interface = &interface;
 }
-};
+}

Svc/FramingProtocol/DeframingProtocol.hpp

@@ -62,5 +62,5 @@ class DeframingProtocol {
   PROTECTED:
     DeframingProtocolInterface* m_interface;
 };
-};
+}
 #endif  // SVC_DEFRAMING_PROTOCOL_HPP

Svc/FramingProtocol/FprimeProtocol.cpp

@@ -131,4 +131,4 @@ DeframingProtocol::DeframingStatus FprimeDeframing::deframe(Types::CircularBuffe
     m_interface->route(buffer);
     return DeframingProtocol::DEFRAMING_STATUS_SUCCESS;
 }
-};
+}

Svc/FramingProtocol/FramingProtocol.cpp

@@ -22,4 +22,4 @@ void FramingProtocol::setup(FramingProtocolInterface& interface) {
     FW_ASSERT(m_interface == nullptr);
     m_interface = &interface;
 }
-};
+}

Svc/UdpReceiver/UdpReceiverComponentImpl.cpp

@@ -22,8 +22,8 @@
 #include <arpa/inet.h>
 #include <Os/TaskString.hpp>
 
-//#define DEBUG_PRINT(x,...) printf(x,##__VA_ARGS__)
-#define DEBUG_PRINT(x,...)
+//#define DEBUG_PRINT(...) printf(##__VA_ARGS__)
+#define DEBUG_PRINT(...)
 
 namespace Svc {
 

Svc/UdpSender/UdpSenderComponentImpl.cpp

@@ -19,8 +19,8 @@
 #include <cstdlib>
 #include <unistd.h>
 
-//#define DEBUG_PRINT(x,...) printf(x,##__VA_ARGS__)
-#define DEBUG_PRINT(x,...)
+//#define DEBUG_PRINT(...) printf(##__VA_ARGS__)
+#define DEBUG_PRINT(...)
 
 namespace Svc {
 

Utils/Types/Queue.cpp

@@ -53,4 +53,4 @@ NATIVE_UINT_TYPE Queue::getQueueSize() const {
 }
 
 
-};  // namespace Types
+}  // namespace Types

config/FpConfig.hpp

@@ -11,4 +11,4 @@
 #include <Fw/Types/BasicTypes.hpp>
 extern "C" {
 #include <FpConfig.h>
-};
+}