Skip to content

Fix build #810

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LocutusOfBorg wants to merge 3 commits into
base: master
Choose a base branch
from
+15 −20
Open

Fix build #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fe4faf
Fix pedantic gcc error about double ending ";"
LocutusOfBorg Jan 6, 2026
e190bfc
Fix unused curr_time variable with systemd enabled
LocutusOfBorg Jan 6, 2026
c9baeeb
Fix another issue with gtest and is_open missing return value check
LocutusOfBorg Feb 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions doc/dlt_for_developers.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ this document.
```
#include <dlt/dlt.h>

DLT_DECLARE_CONTEXT(ctx); /* declare context */
DLT_DECLARE_CONTEXT(ctx) /* declare context */

int main()
{
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/example1/example1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

#include <dlt.h>

DLT_DECLARE_CONTEXT(con_exa1);
DLT_DECLARE_CONTEXT(con_exa1)

int main()
{
Expand Down
2 changes: 1 addition & 1 deletion examples/example2/example2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

#include "dlt_id.h"

DLT_DECLARE_CONTEXT(con_exa2);
DLT_DECLARE_CONTEXT(con_exa2)

int main()
{
Expand Down
2 changes: 1 addition & 1 deletion examples/example3/example3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

#include "dlt_id.h"

DLT_DECLARE_CONTEXT(con_exa3);
DLT_DECLARE_CONTEXT(con_exa3)

int main()
{
Expand Down
2 changes: 1 addition & 1 deletion examples/example4/example4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

#include <dlt.h>

DLT_DECLARE_CONTEXT(con_exa1);
DLT_DECLARE_CONTEXT(con_exa1)

int main()
{
Expand Down
6 changes: 0 additions & 6 deletions src/daemon/dlt-daemon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/kpi/dlt-kpi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <unistd.h>
#include <pthread.h>

DLT_DECLARE_CONTEXT(kpi_ctx);
DLT_DECLARE_CONTEXT(kpi_ctx)

DltKpiConfig config;

Expand Down
5 changes: 3 additions & 2 deletions tests/components/dlt-logd-converter/gtest_dlt_logd_converter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -590,4 +591,4 @@ TEST(t_logd_parser_loop, normal)
int main(int argc, char** argv) {
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
}
}
Loading