Fix compilation with -Wpedantic on GCC (#1059)

* Enable -Wpedantic for GCC by default

* cmake: add -Wno-pedantic for FreeRTOS_Sockets.c && GCC

* Fix warnings with enum eFrameProcessingResult

* Fix unit tests

* Fix unit tests

---------

Co-authored-by: tony-josi-aws <[email protected]>

Author: Mixaill

CMakeLists.txt

@@ -201,7 +201,7 @@ add_compile_options(
     $<$<COMPILE_LANG_AND_ID:C,Clang,GNU>:-Wall>
     $<$<COMPILE_LANG_AND_ID:C,Clang,GNU>:-Wextra>
     $<$<COMPILE_LANG_AND_ID:C,Clang,GNU>:-Werror>
-    $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wpedantic>
+    $<$<COMPILE_LANG_AND_ID:C,Clang,GNU>:-Wpedantic>
     $<$<COMPILE_LANG_AND_ID:C,Clang,GNU>:-Wconversion>
     $<$<COMPILE_LANG_AND_ID:C,Clang,GNU>:-Wunused-variable>
     $<$<COMPILE_LANG_AND_ID:C,Clang>:-Weverything>
@@ -217,6 +217,9 @@ add_compile_options(
     $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-extra-semi-stmt>
     $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-missing-noreturn>
     $<$<COMPILE_LANG_AND_ID:C,Clang>:-Wno-cast-align>
+
+    # Suppressions required to build clean with GCC.
+    $<$<COMPILE_LANG_AND_ID:C,GNU>:-Wno-declaration-after-statement>
 )
 
 ########################################################################

source/CMakeLists.txt

@@ -95,6 +95,11 @@ target_include_directories( freertos_plus_tcp SYSTEM
     include
 )
 
+# Suppressions required to build clean with GCC
+if(CMAKE_C_COMPILER_ID STREQUAL GNU)
+    set_source_files_properties(FreeRTOS_Sockets.c PROPERTIES COMPILE_FLAGS -Wno-pedantic)
+endif()
+
 target_link_libraries( freertos_plus_tcp
   PUBLIC
     freertos_config

source/include/FreeRTOS_IPv4.h

@@ -43,7 +43,6 @@
 
 /* Forward declarations. */
 struct xNETWORK_BUFFER;
-enum eFrameProcessingResult;
 struct xIP_PACKET;
 
 #define ipSIZE_OF_IPv4_HEADER               20U
@@ -97,15 +96,6 @@ BaseType_t xIsIPv4Loopback( uint32_t ulAddress );
  */
 BaseType_t xBadIPv4Loopback( const IPHeader_t * const pxIPHeader );
 
-/* The function 'prvAllowIPPacket()' checks if a packets should be processed. */
-enum eFrameProcessingResult prvAllowIPPacketIPv4( const struct xIP_PACKET * const pxIPPacket,
-                                                  const struct xNETWORK_BUFFER * const pxNetworkBuffer,
-                                                  UBaseType_t uxHeaderLength );
-
-/* Check if the IP-header is carrying options. */
-enum eFrameProcessingResult prvCheckIP4HeaderOptions( struct xNETWORK_BUFFER * const pxNetworkBuffer );
-
-
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     } /* extern "C" */

source/include/FreeRTOS_IPv4_Private.h

@@ -125,6 +125,15 @@ struct xTCP_PACKET
 #include "pack_struct_end.h"
 typedef struct xTCP_PACKET TCPPacket_t;
 
+
+/* The function 'prvAllowIPPacket()' checks if a packets should be processed. */
+enum eFrameProcessingResult prvAllowIPPacketIPv4( const struct xIP_PACKET * const pxIPPacket,
+                                                  const struct xNETWORK_BUFFER * const pxNetworkBuffer,
+                                                  UBaseType_t uxHeaderLength );
+
+/* Check if the IP-header is carrying options. */
+enum eFrameProcessingResult prvCheckIP4HeaderOptions( struct xNETWORK_BUFFER * const pxNetworkBuffer );
+
 /* *INDENT-OFF* */
 #ifdef __cplusplus
     } /* extern "C" */

test/unit-test/FreeRTOS_IP/FreeRTOS_IP_utest.c

@@ -46,6 +46,7 @@
 
 #include "mock_FreeRTOS_IP.h"
 #include "mock_FreeRTOS_IP_Private.h"
+#include "mock_FreeRTOS_IPv4_Private.h"
 #include "mock_FreeRTOS_IP_Utils.h"
 #include "mock_FreeRTOS_IP_Timers.h"
 #include "mock_FreeRTOS_TCP_IP.h"

test/unit-test/FreeRTOS_IP/ut.cmake

@@ -33,6 +33,7 @@ list(APPEND mock_list
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_TCP_IP.h"
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_UDP_IP.h"
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IP_Private.h"
+            "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IPv4_Private.h"
             "${CMAKE_BINARY_DIR}/Annexed_TCP/NetworkBufferManagement.h"
             "${CMAKE_BINARY_DIR}/Annexed_TCP/NetworkInterface.h"
             "${MODULE_ROOT_DIR}/test/unit-test/${project_name}/IP_list_macros.h"

test/unit-test/FreeRTOS_IPv4_DiffConfig/ut.cmake

@@ -17,7 +17,6 @@ list(APPEND mock_list
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IP.h"
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IP_Timers.h"
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IP_Utils.h"
-            "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IPv4_Private.h"
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_Routing.h"
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_ARP.h"
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_ICMP.h"

test/unit-test/FreeRTOS_IPv4_DiffConfig1/ut.cmake

@@ -17,7 +17,6 @@ list(APPEND mock_list
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IP_Timers.h"
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IP_Utils.h"
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IP.h"
-            "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_IPv4_Private.h"
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_Routing.h"
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_ARP.h"
             "${CMAKE_BINARY_DIR}/Annexed_TCP/FreeRTOS_ICMP.h"