summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLassi Marttala <lassi.lm.marttala@partner.bmw.com>2012-02-21 14:17:22 +0100
committerChristian Muck <christian.muck@bmw.de>2012-04-04 14:30:53 +0200
commit7a05de3e3aa2906a81fa7b314bc2e01e0b62956b (patch)
tree125c2687115355499465b2d5197b385914b7e778
parent5909561a7ac82ba25694321f3ffa37c83f7e085f (diff)
downloadDLT-daemon-7a05de3e3aa2906a81fa7b314bc2e01e0b62956b.tar.gz
GENDLT-15, Fixes to previous integrations from review.
Signed-off-by: Christian Muck <christian.muck@bmw.de>
-rwxr-xr-xsrc/daemon/dlt_daemon_common.c2
-rwxr-xr-xsrc/lib/dlt_user.c12
2 files changed, 8 insertions, 6 deletions
diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c
index 2e3cc75..2de511c 100755
--- a/src/daemon/dlt_daemon_common.c
+++ b/src/daemon/dlt_daemon_common.c
@@ -301,7 +301,7 @@ DltDaemonApplication* dlt_daemon_application_add(DltDaemon *daemon,char *apid,pi
if (application->application_description)
{
free(application->application_description);
- application->application_description=0; // opt mb: moved inside here (very minor opt ;-)
+ application->application_description=0;
}
if (description)
diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
index b9ceb14..8fa184b 100755
--- a/src/lib/dlt_user.c
+++ b/src/lib/dlt_user.c
@@ -974,11 +974,13 @@ inline int dlt_user_log_write_start(DltContext *handle, DltContextData *log,DltL
int dlt_user_log_write_start_id(DltContext *handle, DltContextData *log,DltLogLevelType loglevel, uint32_t messageid)
{
- if (dlt_init()<0)
- {
- return -1;
- }
-
+ if(dlt_user_initialised==0)
+ {
+ if (dlt_init()<0)
+ {
+ return -1;
+ }
+ }
if (log==0)
{
return -1;