Merge pull request #582 from kswiecicki/extra-compiler-flags

Add extra compilation flags

Author: bratpiorka

cmake/helpers.cmake

@@ -99,6 +99,8 @@ function(add_umf_target_compile_options name)
                     -Wunused-parameter
                     -Wformat
                     -Wformat-security
+                    -Wcast-qual
+                    -Wunused-result
                     $<$<CXX_COMPILER_ID:GNU>:-fdiagnostics-color=auto>)
         if(CMAKE_BUILD_TYPE STREQUAL "Release")
             target_compile_definitions(${name} PRIVATE -D_FORTIFY_SOURCE=2)

src/provider/provider_os_memory_posix.c

@@ -87,5 +87,12 @@ int os_purge(void *addr, size_t length, int advice) {
 }
 
 void os_strerror(int errnum, char *buf, size_t buflen) {
-    strerror_r(errnum, buf, buflen);
+// 'strerror_r' implementation is XSI-compliant (returns 0 on success)
+#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE
+    if (strerror_r(errnum, buf, buflen)) {
+#else // 'strerror_r' implementation is GNU-specific (returns pointer on success)
+    if (!strerror_r(errnum, buf, buflen)) {
+#endif
+        LOG_PERR("Retrieving error code description failed");
+    }
 }

src/provider/provider_tracking.c

@@ -583,8 +583,9 @@ static size_t getDataSizeFromIpcHandle(const void *providerIpcData) {
     // by umf_ipc_data_t. We use this trick to get pointer to
     // umf_ipc_data_t data because the providerIpcData is
     // the Flexible Array Member of umf_ipc_data_t.
-    umf_ipc_data_t *ipcUmfData =
-        (umf_ipc_data_t *)((uint8_t *)providerIpcData - sizeof(umf_ipc_data_t));
+    const umf_ipc_data_t *ipcUmfData =
+        (const umf_ipc_data_t *)((const uint8_t *)providerIpcData -
+                                 sizeof(umf_ipc_data_t));
     return ipcUmfData->baseSize;
 }
 

src/utils/utils_log.c

@@ -133,7 +133,7 @@ static void util_log_internal(util_log_level_t level, int perror,
             char err_buff[1024]; // max size according to manpage.
             int saveno = errno;
             errno = 0;
-            char *err = strerror_r(saveno, err_buff, sizeof(err_buff));
+            const char *err = strerror_r(saveno, err_buff, sizeof(err_buff));
             if (errno == ERANGE) {
                 postfix = "[truncated...]";
             }

test/CMakeLists.txt

@@ -56,6 +56,13 @@ function(build_umf_test)
         SRCS ${ARG_SRCS}
         LIBS ${TEST_LIBS})
 
+    if(NOT MSVC)
+        # Suppress 'cast discards const qualifier' warnings. Parametrized GTEST
+        # tests retrieve arguments using 'GetParam()', which applies a 'const'
+        # qualifier often discarded in the test scenarios.
+        target_compile_options(${TEST_TARGET_NAME} PRIVATE -Wno-cast-qual)
+    endif()
+
     target_link_directories(${TEST_TARGET_NAME} PRIVATE ${LIB_DIRS})
 
     target_include_directories(