From 7a05de3e3aa2906a81fa7b314bc2e01e0b62956b Mon Sep 17 00:00:00 2001 From: Lassi Marttala Date: Tue, 21 Feb 2012 14:17:22 +0100 Subject: GENDLT-15, Fixes to previous integrations from review. Signed-off-by: Christian Muck --- src/daemon/dlt_daemon_common.c | 2 +- src/lib/dlt_user.c | 12 +++++++----- 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; -- cgit v1.2.1