cmake: Fix build errors and warnings

The rework addresses multiple build
errors and warnings encountered under
strict compilation flags (e.g., -Werror).

The following issues were resolved:
- Pointer type errors in gzflush calls
are now wrapped in #ifdef DLT_LOGSTORAGE_USE_GZIP
to ensure correct compilation when GZIP support is enabled.
- String truncation and buffer overflow warnings
in logstorage path and filename handling are
fixed by using snprintf and proper length checks.
- The inline keyword was removed from the declaration
of dlt_user_is_logLevel_enabled to match its definition
and resolve unused inline warnings.
- The node_id buffer in passive node control is now
properly null-terminated after strncpy to prevent
truncation warnings.
- The argument order for calloc in dlt-example-user.c
was corrected to avoid transposed-args warnings.

Signed-off-by: lum3hc <[email protected]>

Author: minminlittleshrimp

CMakeLists.txt

@@ -241,6 +241,7 @@ add_compile_options(
     # -pedantic
     -Wno-variadic-macros
     -Wno-strict-aliasing
+    -Werror
 )
 
 if(WITH_DOC STREQUAL "OFF")

include/dlt/dlt_client.h

@@ -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_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

@@ -1262,7 +1262,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/console/dlt-passive-node-ctrl.c

@@ -113,7 +113,8 @@ void set_node_id(char *id)
         exit(-1);
     }
     else {
-        strncpy(g_options.node_id, id, DLT_ID_SIZE);
+        strncpy(g_options.node_id, id, DLT_ID_SIZE - 1);
+        g_options.node_id[DLT_ID_SIZE - 1] = '\0';
     }
 }
 

src/daemon/dlt-daemon.c

@@ -61,6 +61,14 @@
 #   endif
 #endif
 
+#include <getopt.h>
+#ifndef CONFIGURATION_FILES_DIR
+#define CONFIGURATION_FILES_DIR "/etc"
+#endif
+#ifndef DLT_USER_IPC_PATH
+#define DLT_USER_IPC_PATH "/tmp"
+#endif
+
 #include "dlt_types.h"
 #include "dlt-daemon.h"
 #include "dlt-daemon_cfg.h"
@@ -204,7 +212,7 @@ void usage()
     printf("Options:\n");
     printf("  -d            Daemonize\n");
     printf("  -h            Usage\n");
-    printf("  -c filename   DLT daemon configuration file (Default: " CONFIGURATION_FILES_DIR "/dlt.conf)\n");
+    printf("  -c filename   DLT daemon configuration file (Default: %s/dlt.conf)\n", CONFIGURATION_FILES_DIR);
 
 #ifdef DLT_DAEMON_USE_FIFO_IPC
     printf("  -t directory  Directory for local fifo and user-pipes (Default: /tmp)\n");
@@ -363,10 +371,18 @@ int option_handling(DltDaemonLocal *daemon_local, int argc, char *argv[])
     /* switch() */
 
 #ifdef DLT_DAEMON_USE_FIFO_IPC
-    snprintf(daemon_local->flags.userPipesDir, DLT_PATH_MAX,
-             "%s/dltpipes", dltFifoBaseDir);
-    snprintf(daemon_local->flags.daemonFifoName, DLT_PATH_MAX,
-             "%s/dlt", dltFifoBaseDir);
+    if (strlen(dltFifoBaseDir) + strlen("/dltpipes") < DLT_PATH_MAX) {
+        snprintf(daemon_local->flags.userPipesDir, DLT_PATH_MAX,
+                 "%s/dltpipes", dltFifoBaseDir);
+    } else {
+        daemon_local->flags.userPipesDir[0] = '\0';
+    }
+    if (strlen(dltFifoBaseDir) + strlen("/dlt") < DLT_PATH_MAX) {
+        snprintf(daemon_local->flags.daemonFifoName, DLT_PATH_MAX,
+                 "%s/dlt", dltFifoBaseDir);
+    } else {
+        daemon_local->flags.daemonFifoName[0] = '\0';
+    }
 #endif
 
 #ifdef DLT_SHM_ENABLE
@@ -407,7 +423,7 @@ int option_file_parser(DltDaemonLocal *daemon_local)
 #else /* DLT_DAEMON_USE_FIFO_IPC */
     n = snprintf(daemon_local->flags.loggingFilename,
                  sizeof(daemon_local->flags.loggingFilename),
-                 "%s/dlt.log", dltFifoBaseDir);
+                 "%s/dlt.log", DLT_USER_IPC_PATH);
 #endif
 
     if (n < 0 || (size_t)n > sizeof(daemon_local->flags.loggingFilename)) {
@@ -1309,7 +1325,7 @@ int trace_load_config_file_parser(DltDaemon *daemon, DltDaemonLocal *daemon_loca
 }
 #endif
 
-static int dlt_mkdir_recursive(const char *dir)
+int dlt_mkdir_recursive(const char *dir)
 {
     int ret = 0;
     char tmp[PATH_MAX + 1];
@@ -1464,21 +1480,17 @@ int main(int argc, char *argv[])
     PRINT_FUNCTION_VERBOSE(daemon_local.flags.vflag);
 
 /* Make sure the parent user directory is created */
+const char *dir_to_create;
 #ifdef DLT_DAEMON_USE_FIFO_IPC
-
-    if (dlt_mkdir_recursive(dltFifoBaseDir) != 0) {
-        dlt_vlog(LOG_ERR, "Base dir %s cannot be created!\n", dltFifoBaseDir);
-        return -1;
-  }
-
+    dir_to_create = dltFifoBaseDir;
 #else
-    if (dlt_mkdir_recursive(DLT_USER_IPC_PATH) != 0) {
-        dlt_vlog(LOG_ERR, "Base dir %s cannot be created!\n", daemon_local.flags.appSockPath);
+    dir_to_create = DLT_USER_IPC_PATH;
+#endif
+    if (dlt_mkdir_recursive(dir_to_create) != 0) {
+        dlt_vlog(LOG_ERR, "Base dir %s cannot be created!\n", dir_to_create);
         return -1;
     }
 
-#endif
-
     /* --- Daemon init phase 1 begin --- */
     if (dlt_daemon_local_init_p1(&daemon, &daemon_local, daemon_local.flags.vflag) == -1) {
         dlt_log(LOG_CRIT, "Initialization of phase 1 failed!\n");

src/daemon/dlt_daemon_common.c

@@ -720,11 +720,15 @@ DltDaemonApplication *dlt_daemon_application_add(DltDaemon *daemon,
 #endif
 #ifdef DLT_DAEMON_USE_FIFO_IPC
         if (dlt_user_handle < DLT_FD_MINIMUM) {
-            snprintf(filename,
-                     DLT_DAEMON_COMMON_TEXTBUFSIZE,
-                     "%s/dltpipes/dlt%d",
-                     dltFifoBaseDir,
-                     pid);
+            if (strlen(dltFifoBaseDir) + strlen("/dltpipes/dlt") + 11 < DLT_DAEMON_COMMON_TEXTBUFSIZE) { // 11 for max pid digits
+                snprintf(filename,
+                         DLT_DAEMON_COMMON_TEXTBUFSIZE,
+                         "%s/dltpipes/dlt%d",
+                         dltFifoBaseDir,
+                         pid);
+            } else {
+                filename[0] = '\0';
+            }
 
             dlt_user_handle = open(filename, O_WRONLY | O_NONBLOCK);
 

src/examples/dlt-example-user.c

@@ -270,7 +270,7 @@ int main(int argc, char *argv[])
             message = argv[index];
     }
     else { /* allocate raw buffer */
-        message = calloc(sizeof(char), rvalue);
+        message = calloc(rvalue, sizeof(char));
         memset(message, 'X', rvalue - 1);
     }
 

src/gateway/dlt_gateway.c

@@ -1608,9 +1608,9 @@ int dlt_gateway_forward_control_message(DltGateway *gateway,
     return DLT_RETURN_OK;
 }
 
-int dlt_gateway_process_on_demand_request(DltGateway *gateway,
+DltReturnValue dlt_gateway_process_on_demand_request(DltGateway *gateway,
                                           DltDaemonLocal *daemon_local,
-                                          char node_id[DLT_ID_SIZE],
+                                          char *node_id,
                                           int connection_status,
                                           int verbose)
 {

src/gateway/dlt_gateway.h

@@ -112,7 +112,7 @@ DltReceiver *dlt_gateway_get_connection_receiver(DltGateway *g, int fd);
  * @param verbose verbose flag
  * @return 0 on success, -1 otherwise
  */
-int dlt_gateway_process_passive_node_messages(DltDaemon *daemon,
+DltReturnValue dlt_gateway_process_passive_node_messages(DltDaemon *daemon,
                                               DltDaemonLocal *daemon_local,
                                               DltReceiver *recv,
                                               int verbose);
@@ -157,7 +157,7 @@ int dlt_gateway_forward_control_message(DltGateway *g,
  * @param verbose           verbose flag
  * @return 0 on success, -1 otherwise
  */
-int dlt_gateway_process_on_demand_request(DltGateway *g,
+DltReturnValue dlt_gateway_process_on_demand_request(DltGateway *g,
                                           DltDaemonLocal *daemon_local,
                                           char *node_id,
                                           int connection_status,