diff options
| author | Lassi Marttala <lassi.lm.marttala@partner.bmw.com> | 2012-02-21 12:30:19 +0100 |
|---|---|---|
| committer | Christian Muck <christian.muck@bmw.de> | 2012-04-04 14:30:21 +0200 |
| commit | 31d98df29efded065521400c9cdc6ba5a9af9c54 (patch) | |
| tree | 2f61580da80aeb7737e320c153b4ff05ca844cca | |
| parent | 64646a665c9fafc4454c67b6212702ed59e01c87 (diff) | |
| download | DLT-daemon-31d98df29efded065521400c9cdc6ba5a9af9c54.tar.gz | |
GENDLT-15, Optimize usege of strlen.
Improved log level handling.
Signed-off-by: Christian Muck <christian.muck@bmw.de>
| -rwxr-xr-x | src/lib/dlt_user.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c index f655d14..3e8bf0e 100755 --- a/src/lib/dlt_user.c +++ b/src/lib/dlt_user.c @@ -669,7 +669,7 @@ int dlt_register_context_ll_ts(DltContext *handle, const char *contextid, const { int desc_len = strlen(description); dlt_user.dlt_ll_ts[dlt_user.dlt_ll_ts_num_entries].context_description = malloc(desc_len+1); - strncpy(dlt_user.dlt_ll_ts[dlt_user.dlt_ll_ts_num_entries].context_description, description, strlen(desc_len)); + strncpy(dlt_user.dlt_ll_ts[dlt_user.dlt_ll_ts_num_entries].context_description, description, desc_len); /* Terminate transmitted string with 0 */ dlt_user.dlt_ll_ts[dlt_user.dlt_ll_ts_num_entries].context_description[desc_len]='\0'; @@ -986,21 +986,6 @@ int dlt_user_log_write_start_id(DltContext *handle, DltContextData *log,DltLogLe return -1; } - /* Removed because of DltLogLevelType - - if ((loglevel<DLT_LOG_DEFAULT) || (loglevel>DLT_LOG_VERBOSE)) - { - return -1; - } - - */ - - mid = messageid; - - log->args_num = 0; - log->log_level = loglevel; - log->size = 0; - if (dlt_user.dlt_ll_ts==0) { return -1; @@ -1008,9 +993,11 @@ int dlt_user_log_write_start_id(DltContext *handle, DltContextData *log,DltLogLe DLT_SEM_LOCK(); - if ((log->log_level<=(int)(dlt_user.dlt_ll_ts[handle->log_level_pos].log_level) ) && (log->log_level!=0)) + if ((loglevel<=(int)(dlt_user.dlt_ll_ts[handle->log_level_pos].log_level) ) && (loglevel!=0)) { DLT_SEM_FREE(); + log->args_num = 0; + log->log_level = loglevel; /* In non-verbose mode, insert message id */ if (dlt_user.verbose_mode==0) @@ -1020,12 +1007,13 @@ int dlt_user_log_write_start_id(DltContext *handle, DltContextData *log,DltLogLe return -1; } /* Write message id */ - memcpy(log->buffer,&(mid),sizeof(uint32_t)); + memcpy(log->buffer,&(messageid),sizeof(uint32_t)); log->size = sizeof(uint32_t); /* 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 |