summaryrefslogtreecommitdiff
path: root/src/lib/dlt_user.c
diff options
context:
space:
mode:
authorAlexander Wenzel <Alexander.AW.Wenzel@bmw.de>2014-10-30 13:06:17 +0100
committerAlexander Wenzel <Alexander.AW.Wenzel@bmw.de>2014-10-30 14:39:02 +0100
commit8374325527b8165914b6c9677a08b005ff4d4bf1 (patch)
tree20febac16dcf0e761b533c158f6c5294923cc0bb /src/lib/dlt_user.c
parentc8d990b893838b3263ac020b095f1a520908e815 (diff)
downloadDLT-daemon-8374325527b8165914b6c9677a08b005ff4d4bf1.tar.gz
Fix dlt_user_log_write_start_id return value
Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
Diffstat (limited to 'src/lib/dlt_user.c')
-rw-r--r--src/lib/dlt_user.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
index 7dfc913..22283c2 100644
--- a/src/lib/dlt_user.c
+++ b/src/lib/dlt_user.c
@@ -1265,10 +1265,14 @@ int dlt_user_log_write_start_id(DltContext *handle, DltContextData *log,DltLogLe
return -1;
}
+ /* initialize values */
+ log->args_num = 0;
+ log->log_level = loglevel;
+ log->size = 0;
+
+ /* check log levels */
if (handle->log_level_ptr && (loglevel<=(int)*(handle->log_level_ptr) ) && (loglevel!=0))
{
- log->args_num = 0;
- log->log_level = loglevel;
/* In non-verbose mode, insert message id */
if (dlt_user.verbose_mode==0)
@@ -1284,9 +1288,12 @@ int dlt_user_log_write_start_id(DltContext *handle, DltContextData *log,DltLogLe
/* as the message id is part of each message in non-verbose mode,
it doesn't increment the argument counter in extended header (if used) */
}
- else log->size=0;
return 1;
}
+ else
+ {
+ return 0;
+ }
return -1;
}
@@ -2538,10 +2545,10 @@ int dlt_user_trace_network_truncated(DltContext *handle, DltNetworkTraceType nw_
}
/**
- * Calculate maximum avaialble space in sending buffer after headers.
+ * Calculate maximum available space in sending buffer after headers.
*/
- int truncated_payload_len = DLT_USER_BUF_MAX_SIZE -
+ int truncated_payload_len = DLT_USER_BUF_MAX_SIZE -
log.size - sizeof(uint16_t) - sizeof(uint32_t);
/* Write truncated payload */