From 8a696d78be849d6e3ba93b8ddecf5c3b48902a3e Mon Sep 17 00:00:00 2001 From: Saya Sugiura Date: Fri, 10 Dec 2021 10:58:29 +0900 Subject: lib: Correct VARI usage in dlt_user_log_write_uint Closes #352 Signed-off-by: Saya Sugiura --- src/lib/dlt_user.c | 100 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 86 insertions(+), 14 deletions(-) diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c index 5a880dc..99df11b 100644 --- a/src/lib/dlt_user.c +++ b/src/lib/dlt_user.c @@ -2157,7 +2157,7 @@ DltReturnValue dlt_user_log_write_float64_attr(DltContextData *log, float64_t da return dlt_user_log_write_generic_attr(log, &data, sizeof(float64_t), type_info, &var_info); } -DltReturnValue dlt_user_log_write_uint_attr(DltContextData *log, unsigned int data, const char *name, const char *unit) +DltReturnValue dlt_user_log_write_uint(DltContextData *log, unsigned int data) { if (log == NULL) return DLT_RETURN_WRONG_PARAMETER; @@ -2170,22 +2170,22 @@ DltReturnValue dlt_user_log_write_uint_attr(DltContextData *log, unsigned int da switch (sizeof(unsigned int)) { case 1: { - return dlt_user_log_write_uint8_attr(log, (uint8_t)data, name, unit); + return dlt_user_log_write_uint8(log, (uint8_t)data); break; } case 2: { - return dlt_user_log_write_uint16_attr(log, (uint16_t)data, name, unit); + return dlt_user_log_write_uint16(log, (uint16_t)data); break; } case 4: { - return dlt_user_log_write_uint32_attr(log, (uint32_t)data, name, unit); + return dlt_user_log_write_uint32(log, (uint32_t)data); break; } case 8: { - return dlt_user_log_write_uint64_attr(log, (uint64_t)data, name, unit); + return dlt_user_log_write_uint64(log, (uint64_t)data); break; } default: @@ -2222,9 +2222,45 @@ DltReturnValue dlt_user_log_write_uint64(DltContextData *log, uint64_t data) return dlt_user_log_write_generic_attr(log, &data, sizeof(uint64_t), type_info, NULL); } -DltReturnValue dlt_user_log_write_uint(DltContextData *log, unsigned int data) +DltReturnValue dlt_user_log_write_uint_attr(DltContextData *log, unsigned int data, const char *name, const char *unit) { - return dlt_user_log_write_uint_attr(log, data, NULL, NULL); + if (log == NULL) + return DLT_RETURN_WRONG_PARAMETER; + + if (!dlt_user_initialised) { + dlt_vlog(LOG_WARNING, "%s dlt_user_initialised false\n", __FUNCTION__); + return DLT_RETURN_ERROR; + } + + switch (sizeof(unsigned int)) { + case 1: + { + return dlt_user_log_write_uint8_attr(log, (uint8_t)data, name, unit); + break; + } + case 2: + { + return dlt_user_log_write_uint16_attr(log, (uint16_t)data, name, unit); + break; + } + case 4: + { + return dlt_user_log_write_uint32_attr(log, (uint32_t)data, name, unit); + break; + } + case 8: + { + return dlt_user_log_write_uint64_attr(log, (uint64_t)data, name, unit); + break; + } + default: + { + return DLT_RETURN_ERROR; + break; + } + } + + return DLT_RETURN_OK; } DltReturnValue dlt_user_log_write_uint8_attr(DltContextData *log, uint8_t data, const char *name, const char *unit) @@ -2307,7 +2343,7 @@ DltReturnValue dlt_user_log_write_ptr(DltContextData *log, void *data) return DLT_RETURN_OK; } -DltReturnValue dlt_user_log_write_int_attr(DltContextData *log, int data, const char *name, const char *unit) +DltReturnValue dlt_user_log_write_int(DltContextData *log, int data) { if (log == NULL) return DLT_RETURN_WRONG_PARAMETER; @@ -2320,22 +2356,22 @@ DltReturnValue dlt_user_log_write_int_attr(DltContextData *log, int data, const switch (sizeof(int)) { case 1: { - return dlt_user_log_write_int8_attr(log, (int8_t)data, name, unit); + return dlt_user_log_write_int8(log, (int8_t)data); break; } case 2: { - return dlt_user_log_write_int16_attr(log, (int16_t)data, name, unit); + return dlt_user_log_write_int16(log, (int16_t)data); break; } case 4: { - return dlt_user_log_write_int32_attr(log, (int32_t)data, name, unit); + return dlt_user_log_write_int32(log, (int32_t)data); break; } case 8: { - return dlt_user_log_write_int64_attr(log, (int64_t)data, name, unit); + return dlt_user_log_write_int64(log, (int64_t)data); break; } default: @@ -2372,9 +2408,45 @@ DltReturnValue dlt_user_log_write_int64(DltContextData *log, int64_t data) return dlt_user_log_write_generic_attr(log, &data, sizeof(int64_t), type_info, NULL); } -DltReturnValue dlt_user_log_write_int(DltContextData *log, int data) +DltReturnValue dlt_user_log_write_int_attr(DltContextData *log, int data, const char *name, const char *unit) { - return dlt_user_log_write_int_attr(log, data, NULL, NULL); + if (log == NULL) + return DLT_RETURN_WRONG_PARAMETER; + + if (!dlt_user_initialised) { + dlt_vlog(LOG_WARNING, "%s dlt_user_initialised false\n", __FUNCTION__); + return DLT_RETURN_ERROR; + } + + switch (sizeof(int)) { + case 1: + { + return dlt_user_log_write_int8_attr(log, (int8_t)data, name, unit); + break; + } + case 2: + { + return dlt_user_log_write_int16_attr(log, (int16_t)data, name, unit); + break; + } + case 4: + { + return dlt_user_log_write_int32_attr(log, (int32_t)data, name, unit); + break; + } + case 8: + { + return dlt_user_log_write_int64_attr(log, (int64_t)data, name, unit); + break; + } + default: + { + return DLT_RETURN_ERROR; + break; + } + } + + return DLT_RETURN_OK; } DltReturnValue dlt_user_log_write_int8_attr(DltContextData *log, int8_t data, const char *name, const char *unit) -- cgit v1.2.1