Merge pull request #782 from COVESA/dlt_devel_fix_cmake

cmake: Fix build errors and warnings

Author: lti9hc

.github/workflows/cmake-ctest.yml

@@ -30,7 +30,7 @@ jobs:
                                                -DBUILD_GMOCK=${{env.BUILD_GMOCK}}
 
     - name: Build
-      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -- -j$(nproc)
 
     - name: Test
       working-directory: ${{github.workspace}}/build

CMakeLists.txt

@@ -231,13 +231,20 @@ if(WITH_DLT_COVERAGE)
 endif()
 
 add_compile_options(
-    $<$<COMPILE_LANGUAGE:C>:-std=gnu99>
+    $<$<COMPILE_LANGUAGE:C>:-std=gnu11>
     $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++14>
     -Wall
     -Wextra
-    # -pedantic
+    -pedantic
     -Wno-variadic-macros
     -Wno-strict-aliasing
+    -Werror
+    -Wconversion
+    -Wshadow
+    -Wundef
+    -Wcast-qual
+    -Wno-system-headers
+    -Wno-unused-function
 )
 
 if(WITH_DOC STREQUAL "OFF")

include/dlt/dlt_client.h

@@ -88,16 +88,16 @@ typedef enum
 
 typedef struct
 {
-    DltReceiver receiver;  /**< receiver pointer to dlt receiver structure */
-    int sock;              /**< sock Connection handle/socket */
-    char *servIP;          /**< servIP IP adress/Hostname of interface */
-    char *hostip;          /**< hostip IP address of UDP host receiver interface */
-    int port;              /**< Port for TCP connections (optional) */
-    char *serialDevice;    /**< serialDevice Devicename of serial device */
-    char *socketPath;      /**< socketPath Unix socket path */
-    char ecuid[4];         /**< ECUiD */
-    speed_t baudrate;      /**< baudrate Baudrate of serial interface, as speed_t */
-    DltClientMode mode;    /**< mode DltClientMode */
+    DltReceiver receiver;      /**< receiver pointer to dlt receiver structure */
+    int sock;                  /**< sock Connection handle/socket */
+    char *servIP;              /**< servIP IP adress/Hostname of interface */
+    char *hostip;              /**< hostip IP address of UDP host receiver interface */
+    uint16_t  port;            /**< Port for TCP connections (optional) */
+    char *serialDevice;        /**< serialDevice Devicename of serial device */
+    char *socketPath;          /**< socketPath Unix socket path */
+    char ecuid[4];             /**< ECUiD */
+    speed_t baudrate;          /**< baudrate Baudrate of serial interface, as speed_t */
+    DltClientMode mode;        /**< mode DltClientMode */
     int send_serial_header;    /**< (Boolean) Send DLT messages with serial header */
     int resync_serial_header;  /**< (Boolean) Resync to serial header on all connection */
 } DltClient;
@@ -116,7 +116,7 @@ void dlt_client_register_fetch_next_message_callback(bool (*registerd_callback)(
  * @param verbose if set to true verbose information is printed out.
  * @return negative value if there was an error
  */
-int dlt_client_init_port(DltClient *client, int port, int verbose);
+DltReturnValue dlt_client_init_port(DltClient *client, int port, int verbose);
 
 /**
  * Initialising dlt client structure
@@ -196,7 +196,7 @@ DltReturnValue dlt_client_send_log_level(DltClient *client, char *apid, char *ct
  * @param client pointer to dlt client structure
  * @return negative value if there was an error
  */
-int dlt_client_get_log_info(DltClient *client);
+DltReturnValue dlt_client_get_log_info(DltClient *client);
 /**
  * Send an request to get default log level to the dlt daemon
  * @param client pointer to dlt client structure
@@ -208,7 +208,7 @@ DltReturnValue dlt_client_get_default_log_level(DltClient *client);
  * @param client pointer to dlt client structure
  * @return negative value if there was an error
  */
-int dlt_client_get_software_version(DltClient *client);
+DltReturnValue dlt_client_get_software_version(DltClient *client);
 /**
  * Initialise get log info structure
  * @return void

include/dlt/dlt_common.h

@@ -73,7 +73,11 @@
  \{
  */
 
-#   include <netinet/in.h>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wconversion"
+#include <netinet/in.h>
+#pragma GCC diagnostic pop
+
 #   include <stdio.h>
 #   include <stdbool.h>
 #   ifdef __linux__
@@ -116,8 +120,7 @@
  * Macros to swap the byte order.
  */
 #   define DLT_SWAP_64(value) ((((uint64_t)DLT_SWAP_32((value) & 0xffffffffull)) << 32) | (DLT_SWAP_32((value) >> 32)))
-
-#   define DLT_SWAP_16(value) ((((value) >> 8) & 0xff) | (((value) << 8) & 0xff00))
+#   define DLT_SWAP_16(value) ((uint16_t)((((value) >> 8) & 0xff) | (((value) << 8) & 0xff00)))
 #   define DLT_SWAP_32(value) ((((value) >> 24) & 0xff) | (((value) << 8) & 0xff0000) | (((value) >> 8) & 0xff00) | \
                                (((value) << 24) & 0xff000000))
 
@@ -174,9 +177,9 @@
 #      define DLT_LETOH_64(x) ((x))
 #   endif
 
-#   define DLT_ENDIAN_GET_16(htyp, x) ((((htyp) & DLT_HTYP_MSBF) > 0) ? DLT_BETOH_16(x) : DLT_LETOH_16(x))
-#   define DLT_ENDIAN_GET_32(htyp, x) ((((htyp) & DLT_HTYP_MSBF) > 0) ? DLT_BETOH_32(x) : DLT_LETOH_32(x))
-#   define DLT_ENDIAN_GET_64(htyp, x) ((((htyp) & DLT_HTYP_MSBF) > 0) ? DLT_BETOH_64(x) : DLT_LETOH_64(x))
+#   define DLT_ENDIAN_GET_16(htyp, x) ((uint16_t)((((htyp) & DLT_HTYP_MSBF) > 0) ? DLT_BETOH_16(x) : DLT_LETOH_16(x)))
+#   define DLT_ENDIAN_GET_32(htyp, x) ((uint32_t)((((htyp) & DLT_HTYP_MSBF) > 0) ? DLT_BETOH_32(x) : DLT_LETOH_32(x)))
+#   define DLT_ENDIAN_GET_64(htyp, x) ((uint64_t)((((htyp) & DLT_HTYP_MSBF) > 0) ? DLT_BETOH_64(x) : DLT_LETOH_64(x)))
 
 #   if defined (__WIN32__) || defined (_MSC_VER)
 #      define LOG_EMERG     0
@@ -233,7 +236,7 @@
 
 
 #   if defined (__MSDOS__) || defined (_MSC_VER)
-#      define __func__ __FUNCTION__
+#       define __func__ __func__
 #   endif
 
 #   define PRINT_FUNCTION_VERBOSE(_verbose) \
@@ -293,7 +296,7 @@
         if ((length < 0) || ((length) < ((int32_t)sizeof(type)))) \
         { length = -1; } \
         else \
-        { dst = *((type *)src); src += sizeof(type); length -= sizeof(type); } \
+        { dst = *((type *)src); src += sizeof(type); length -= (int32_t)sizeof(type); } \
     } while(false)
 
 #   define DLT_MSG_READ_ID(dst, src, length) \
@@ -1688,7 +1691,7 @@ int dlt_set_loginfo_parse_service_id(char *resp_text, uint32_t *service_id, uint
  * @param rp_count  int
  * @return length
  */
-int16_t dlt_getloginfo_conv_ascii_to_uint16_t(char *rp, int *rp_count);
+uint16_t dlt_getloginfo_conv_ascii_to_uint16_t(char *rp, int *rp_count);
 
 /**
  * Convert get log info from ASCII to int16

include/dlt/dlt_log.h

@@ -85,7 +85,7 @@ DltReturnValue dlt_log_init_multiple_logfiles_support(DltLoggingMode mode, bool
 /**
  * Initialize (external) logging facility for single logfile.
  */
-DltReturnValue dlt_log_init_single_logfile();
+DltReturnValue dlt_log_init_single_logfile(void);
 
 /**
  * Initialize (external) logging facility for multiple files logging.
@@ -136,14 +136,14 @@ void dlt_log_multiple_files_write(const char* format, ...);
  */
 void dlt_log_free(void);
 
-void dlt_log_free_single_logfile();
+void dlt_log_free_single_logfile(void);
 
-void dlt_log_free_multiple_logfiles();
+void dlt_log_free_multiple_logfiles(void);
 
 /**
  * Checks whether (internal) logging in multiple files is active.
  */
-bool dlt_is_log_in_multiple_files_active();
+bool dlt_is_log_in_multiple_files_active(void);
 
 #   ifdef __cplusplus
 }

include/dlt/dlt_multiple_files.h

@@ -139,10 +139,9 @@ unsigned int multiple_files_buffer_storage_dir_info(const char *path, const char
 /**
  * Creates filename with index.
  * @param files_buffer pointer to MultipleFilesRingBuffer struct.
- * @param length the maximum length of the log_file_name.
  * @param idx index to be used for file name creation.
  */
-void multiple_files_buffer_file_name(MultipleFilesRingBuffer *files_buffer, size_t length, unsigned int idx);
+void multiple_files_buffer_file_name(MultipleFilesRingBuffer *files_buffer, unsigned int idx);
 
 /**
  * Generates index for log file name.

include/dlt/dlt_user.h.in

@@ -271,6 +271,11 @@ typedef struct
 typedef int (*dlt_injection_callback_id)(uint32_t, void *, uint32_t, void *);
 typedef int (*dlt_injection_callback)(uint32_t, void *, uint32_t);
 
+typedef union {
+    int (*with_id)(uint32_t, void *, uint32_t, void *);
+    int (*without_id)(uint32_t, void *, uint32_t);
+} dlt_injection_callback_internal;
+
 /**************************************************************************************************
 * The following API functions define a low level function interface for DLT
 **************************************************************************************************/
@@ -851,7 +856,7 @@ DltReturnValue dlt_user_trace_network_segmented(DltContext *handle,
  * This function has to be called first, before using any DLT user lib functions.
  * @return Value from DltReturnValue enum
  */
-DltReturnValue dlt_init();
+DltReturnValue dlt_init(void);
 
 /**
  * Initialize the user lib writing only to file.
@@ -874,7 +879,7 @@ DltReturnValue dlt_set_filesize_max(unsigned int filesize);
  * This function has to be called when finishing using the DLT user lib.
  * @return Value from DltReturnValue enum
  */
-DltReturnValue dlt_free();
+DltReturnValue dlt_free(void);
 
 /**
  * Check the library version of DLT library.
@@ -989,7 +994,7 @@ DltReturnValue dlt_set_log_mode(DltUserLogMode mode);
  * Until then the state is "unknown state".
  * @return -1 = unknown state, 0 = client not connected, 1 = client connected
  */
-int dlt_get_log_state();
+int dlt_get_log_state(void);
 
 /**
  * Register callback function called when injection message was received
@@ -1207,7 +1212,7 @@ DltReturnValue dlt_log_raw(DltContext *handle, DltLogLevelType loglevel, void *d
  * Write marker message to DLT.
  * @return Value from DltReturnValue enum
  */
-DltReturnValue dlt_log_marker();
+DltReturnValue dlt_log_marker(void);
 
 /**
  * Get the total size and available size of the shared memory buffer between daemon and applications.
@@ -1241,7 +1246,7 @@ DltReturnValue dlt_user_log_resend_buffer(void);
  * @param loglevel this is the current log level of the log message to be sent
  * @return Value from DltReturnValue enum, DLT_RETURN_TRUE if log level is enabled
  */
-inline DltReturnValue dlt_user_is_logLevel_enabled(DltContext *handle, DltLogLevelType loglevel);
+DltReturnValue dlt_user_is_logLevel_enabled(DltContext *handle, DltLogLevelType loglevel);
 
 
 #   ifdef DLT_TEST_ENABLE

src/adaptor/dlt-adaptor-stdin.c

@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
     DLT_REGISTER_CONTEXT(mycontext, ctid, PS_DLT_CONTEXT_DESC);
 
     if (timeout > -1)
-        dlt_set_resend_timeout_atexit(timeout);
+        dlt_set_resend_timeout_atexit((uint32_t)timeout);
 
     while (fgets(str, MAXSTRLEN, stdin))
         if (strcmp(str, "") != 0)
@@ -202,4 +202,3 @@ int main(int argc, char *argv[])
 
     return 0;
 }
-

src/adaptor/dlt-adaptor-udp.c

@@ -72,6 +72,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <errno.h>
+#include <getopt.h>
 
 #include "dlt_common.h"
 #include "dlt_user.h"
@@ -210,7 +211,7 @@ int main(int argc, char *argv[])
 #else
     server_addr.sin_family = AF_INET;
 #endif
-    server_addr.sin_port = htons(port);
+    server_addr.sin_port = htons((uint16_t)port);
     server_addr.sin_addr.s_addr = INADDR_ANY;
     memset(&(server_addr.sin_zero), 0, 8);
     if (bind(sock, (struct sockaddr *)&server_addr,
@@ -227,8 +228,8 @@ int main(int argc, char *argv[])
     while (1) {
         bytes_read = 0;
 
-        bytes_read = recvfrom(sock, recv_data, MAXSTRLEN, 0,
-                              (struct sockaddr *)&client_addr, &addr_len);
+        bytes_read = (int)recvfrom(sock, recv_data, MAXSTRLEN, 0,
+                                   (struct sockaddr *)&client_addr, &addr_len);
 
         if (bytes_read == -1) {
             if (errno == EINTR) {

src/console/dlt-control-common.c

@@ -337,12 +337,12 @@ static int prepare_headers(DltMessage *msg, uint8_t *header)
     msg->standardheader->mcnt = 0;
 
     /* prepare length information */
-    msg->headersize = (uint32_t) (sizeof(DltStorageHeader) +
-        sizeof(DltStandardHeader) +
-        sizeof(DltExtendedHeader) +
-        DLT_STANDARD_HEADER_EXTRA_SIZE(msg->standardheader->htyp));
+    msg->headersize = (int32_t)(sizeof(DltStorageHeader) +
+                    sizeof(DltStandardHeader) +
+                    sizeof(DltExtendedHeader) +
+                    DLT_STANDARD_HEADER_EXTRA_SIZE(msg->standardheader->htyp));
 
-    len = (uint32_t) (msg->headersize - sizeof(DltStorageHeader) + msg->datasize);
+    len = (uint32_t)(msg->headersize - (int32_t)sizeof(DltStorageHeader) + msg->datasize);
 
     if (len > UINT16_MAX) {
         pr_error("Message header is too long.\n");
@@ -388,7 +388,7 @@ static DltMessage *dlt_control_prepare_message(DltControlMsgBody *data)
     }
 
     /* prepare payload of data */
-    msg->databuffersize = msg->datasize = (uint32_t) data->size;
+    msg->databuffersize = msg->datasize = (int32_t)data->size;
 
     /* Allocate memory for Dlt Message's buffer */
     msg->databuffer = (uint8_t *)calloc(1, data->size);
@@ -432,7 +432,14 @@ static DltMessage *dlt_control_prepare_message(DltControlMsgBody *data)
  */
 static int dlt_control_init_connection(DltClient *client, void *cb)
 {
-    int (*callback)(DltMessage *message, void *data) = cb;
+    union {
+        void *ptr;
+        int (*callback)(DltMessage *message, void *data);
+    } callback_converter;
+    int (*callback)(DltMessage *message, void *data);
+
+    callback_converter.ptr = cb;
+    callback = callback_converter.callback;
 
     if (!cb || !client) {
         pr_error("%s: Invalid parameters\n", __func__);
@@ -624,11 +631,18 @@ int dlt_control_init(int (*response_analyzer)(char *, void *, int),
         return -1;
     }
 
+    union {
+        void *ptr;
+        int (*callback)(DltMessage *message, void *data);
+    } callback_converter;
+
     response_analyzer_cb = response_analyzer;
     set_ecuid(ecuid);
     set_verbosity(verbosity);
+    callback_converter.callback = dlt_control_callback;
 
-    if (dlt_control_init_connection(&g_client, dlt_control_callback) != 0) {
+    /* Initialize DLT connection */
+    if (dlt_control_init_connection(&g_client, callback_converter.ptr) != 0) {
         pr_error("Connection initialization failed\n");
         dlt_client_cleanup(&g_client, get_verbosity());
         return -1;