From 7fe4faf684056f9578fdfac73af93b7c3a60bbff Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 6 Jan 2026 12:52:43 +0100 Subject: [PATCH 1/3] Fix pedantic gcc error about double ending ";" --- doc/dlt_for_developers.md | 14 +++++++------- examples/example1/example1.c | 2 +- examples/example2/example2.c | 2 +- examples/example3/example3.c | 2 +- examples/example4/example4.c | 2 +- src/kpi/dlt-kpi.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/dlt_for_developers.md b/doc/dlt_for_developers.md index ddf5eb563..a9634f459 100644 --- a/doc/dlt_for_developers.md +++ b/doc/dlt_for_developers.md @@ -30,7 +30,7 @@ this document. ``` #include -DLT_DECLARE_CONTEXT(ctx); /* declare context */ +DLT_DECLARE_CONTEXT(ctx) /* declare context */ int main() { @@ -531,18 +531,18 @@ declared once. Therefore a unique variable name for each context has to be used. ``` -DLT_DECLARE_CONTEXT(myContext1); -DLT_DECLARE_CONTEXT(myContext2); -DLT_DECLARE_CONTEXT(myContext3); +DLT_DECLARE_CONTEXT(myContext1) +DLT_DECLARE_CONTEXT(myContext2) +DLT_DECLARE_CONTEXT(myContext3) ``` If contexts from another C or CPP file shall be used, these contexts can be imported by calling: ``` -DLT_IMPORT_CONTEXT(myContext1); -DLT_IMPORT_CONTEXT(myContext2); -DLT_IMPORT_CONTEXT(myContext3); +DLT_IMPORT_CONTEXT(myContext1) +DLT_IMPORT_CONTEXT(myContext2) +DLT_IMPORT_CONTEXT(myContext3) ``` After the application is registered and contexts are declared, contexts need to diff --git a/examples/example1/example1.c b/examples/example1/example1.c index c1340ef83..894915cf1 100644 --- a/examples/example1/example1.c +++ b/examples/example1/example1.c @@ -48,7 +48,7 @@ #include -DLT_DECLARE_CONTEXT(con_exa1); +DLT_DECLARE_CONTEXT(con_exa1) int main() { diff --git a/examples/example2/example2.c b/examples/example2/example2.c index 6069b0d5c..c03630e62 100644 --- a/examples/example2/example2.c +++ b/examples/example2/example2.c @@ -50,7 +50,7 @@ #include "dlt_id.h" -DLT_DECLARE_CONTEXT(con_exa2); +DLT_DECLARE_CONTEXT(con_exa2) int main() { diff --git a/examples/example3/example3.c b/examples/example3/example3.c index f8b918ef6..426233e12 100644 --- a/examples/example3/example3.c +++ b/examples/example3/example3.c @@ -50,7 +50,7 @@ #include "dlt_id.h" -DLT_DECLARE_CONTEXT(con_exa3); +DLT_DECLARE_CONTEXT(con_exa3) int main() { diff --git a/examples/example4/example4.c b/examples/example4/example4.c index 99c42679f..412a80bb0 100644 --- a/examples/example4/example4.c +++ b/examples/example4/example4.c @@ -48,7 +48,7 @@ #include -DLT_DECLARE_CONTEXT(con_exa1); +DLT_DECLARE_CONTEXT(con_exa1) int main() { diff --git a/src/kpi/dlt-kpi.c b/src/kpi/dlt-kpi.c index 2ac32bfa4..84dfee28e 100644 --- a/src/kpi/dlt-kpi.c +++ b/src/kpi/dlt-kpi.c @@ -30,7 +30,7 @@ #include #include -DLT_DECLARE_CONTEXT(kpi_ctx); +DLT_DECLARE_CONTEXT(kpi_ctx) DltKpiConfig config; From e190bfc0571385742cad3dd59ea12d822906ea4b Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 6 Jan 2026 12:53:20 +0100 Subject: [PATCH 2/3] Fix unused curr_time variable with systemd enabled --- src/daemon/dlt-daemon.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c index 97af1cd96..4e3d4bff5 100644 --- a/src/daemon/dlt-daemon.c +++ b/src/daemon/dlt-daemon.c @@ -5509,9 +5509,6 @@ int dlt_daemon_send_ringbuffer_to_client(DltDaemon *daemon, DltDaemonLocal *daem int ret; static uint8_t data[DLT_DAEMON_RCVBUFSIZE]; int length; -#ifdef DLT_SYSTEMD_WATCHDOG_ENABLE - uint32_t curr_time = 0U; -#endif PRINT_FUNCTION_VERBOSE(verbose); @@ -5554,9 +5551,6 @@ int dlt_daemon_send_ringbuffer_to_client_v2(DltDaemon *daemon, DltDaemonLocal *d int ret; static uint8_t data[DLT_DAEMON_RCVBUFSIZE]; int length; -#ifdef DLT_SYSTEMD_WATCHDOG_ENABLE - uint32_t curr_time = 0U; -#endif PRINT_FUNCTION_VERBOSE(verbose); From c9baeeb9a9eb90c2926ab8b0d9c4d03da8919c3d Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Sat, 7 Feb 2026 23:26:43 +0100 Subject: [PATCH 3/3] Fix another issue with gtest and is_open missing return value check --- .../dlt-logd-converter/gtest_dlt_logd_converter.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/components/dlt-logd-converter/gtest_dlt_logd_converter.cpp b/tests/components/dlt-logd-converter/gtest_dlt_logd_converter.cpp index 8d6b27d61..ec2851003 100644 --- a/tests/components/dlt-logd-converter/gtest_dlt_logd_converter.cpp +++ b/tests/components/dlt-logd-converter/gtest_dlt_logd_converter.cpp @@ -66,7 +66,8 @@ string t_load_json_file() char *token; string pattern; string json_sequence; - file.is_open(); + if(!file.is_open()) + return ""; while (!file.eof()) { getline(file, pattern); if (pattern.size() == 0) { @@ -590,4 +591,4 @@ TEST(t_logd_parser_loop, normal) int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); -} \ No newline at end of file +}