other: fix remaining conversion warnings

- Converting datatype to the correct one.

- As macro do not perform type-checking before, so these functions used
  it with different datatype could create a lot of conversion warnings.
  For this reason, these warnings could be consider as normal
  information and will not be fixed.

Signed-off-by: Dinh Cong Toan <toan.dinhcong@vn.bosch.com>

3 files changed, 25 insertions, 25 deletions

diff --git a/src/lib/dlt_env_ll.c b/src/lib/dlt_env_ll.c
index 6cf7ded..f58afce 100644
--- a/src/lib/dlt_env_ll.c
+++ b/src/lib/dlt_env_ll.c
@@ -98,7 +98,7 @@ int dlt_env_helper_to_lower(char **const env, char *result, int const res_len)
 
     while (ch && (count < res_len - 1) && (ch != ';')) {
         if ((ch >= 'A') && (ch <= 'Z'))
-            result[count] = ch + 'a' - 'A';
+            result[count] = (char) (ch + 'a' - 'A');
         else
             result[count] = ch;
 
diff --git a/src/lib/dlt_filetransfer.c b/src/lib/dlt_filetransfer.c
index 40acafa..e9fbf3e 100644
--- a/src/lib/dlt_filetransfer.c
+++ b/src/lib/dlt_filetransfer.c
@@ -112,7 +112,7 @@ void stringHash(const char *str, uint32_t *hash)
         return;
 
     for (i = 0; i < len; i++)
-        *hash = 53 * *hash + (uint32_t) str[i];
+        *hash = (uint32_t) ((*hash) * 53) + (uint32_t) str[i];
 }
 
 
@@ -333,7 +333,7 @@ int dlt_user_log_file_infoAbout(DltContext *fileContext, const char *filename)
                 DLT_STRING("filename"), DLT_STRING(filename),
                 DLT_STRING("file size in bytes"), DLT_UINT(fsize),
                 DLT_STRING("file creation date"), DLT_STRING(creationdate),
-                DLT_STRING("number of packages"), DLT_UINT(dlt_user_log_file_packagesCount(fileContext, filename)),
+                DLT_STRING("number of packages"), DLT_INT(dlt_user_log_file_packagesCount(fileContext, filename)),
                 DLT_STRING("FLIF")
                 );
         return 0;
@@ -407,7 +407,7 @@ int dlt_user_log_file_packagesCount(DltContext *fileContext, const char *filenam
             return packages;
         }
         else {
-            packages = filesize / BUFFER_SIZE;
+            packages = (int) (filesize / BUFFER_SIZE);
 
             if (filesize % BUFFER_SIZE == 0)
                 return packages;
@@ -468,7 +468,7 @@ int dlt_user_log_file_header_alias(DltContext *fileContext, const char *filename
                 DLT_STRING(alias),
                 DLT_UINT(fsize),
                 DLT_STRING(fcreationdate);
-                DLT_UINT(dlt_user_log_file_packagesCount(fileContext, filename)),
+                DLT_INT(dlt_user_log_file_packagesCount(fileContext, filename)),
                 DLT_UINT(BUFFER_SIZE),
                 DLT_STRING("FLST")
                 );
@@ -523,7 +523,7 @@ int dlt_user_log_file_header(DltContext *fileContext, const char *filename)
                 DLT_STRING(filename),
                 DLT_UINT(fsize),
                 DLT_STRING(fcreationdate);
-                DLT_UINT(dlt_user_log_file_packagesCount(fileContext, filename)),
+                DLT_INT(dlt_user_log_file_packagesCount(fileContext, filename)),
                 DLT_UINT(BUFFER_SIZE),
                 DLT_STRING("FLST")
                 );
@@ -548,7 +548,7 @@ int dlt_user_log_file_data(DltContext *fileContext, const char *filename, int pa
 {
     FILE *file;
     int pkgNumber;
-    uint32_t readBytes;
+    uint16_t readBytes;
 
     if (isFile(filename)) {
 
@@ -565,9 +565,9 @@ int dlt_user_log_file_data(DltContext *fileContext, const char *filename, int pa
             DLT_LOG(*fileContext, DLT_LOG_ERROR,
                     DLT_STRING("Error at dlt_user_log_file_data: packageToTransfer out of scope"),
                     DLT_STRING("packageToTransfer:"),
-                    DLT_UINT(packageToTransfer),
+                    DLT_INT(packageToTransfer),
                     DLT_STRING("numberOfMaximalPackages:"),
-                    DLT_UINT(dlt_user_log_file_packagesCount(fileContext, filename)),
+                    DLT_INT(dlt_user_log_file_packagesCount(fileContext, filename)),
                     DLT_STRING("for File:"),
                     DLT_STRING(filename)
                     );
@@ -595,7 +595,7 @@ int dlt_user_log_file_data(DltContext *fileContext, const char *filename, int pa
 
             }
 
-            readBytes = (uint32_t) fread(buffer, sizeof(char), BUFFER_SIZE, file);
+            readBytes = (uint16_t) fread(buffer, sizeof(char), BUFFER_SIZE, file);
             int ok;
 
             uint32_t fserial = getFileSerialNumber(filename, &ok);
@@ -608,7 +608,7 @@ int dlt_user_log_file_data(DltContext *fileContext, const char *filename, int pa
             DLT_LOG(*fileContext, DLT_LOG_INFO,
                     DLT_STRING("FLDA"),
                     DLT_UINT(fserial),
-                    DLT_UINT(packageToTransfer),
+                    DLT_INT(packageToTransfer),
                     DLT_RAW(buffer, readBytes),
                     DLT_STRING("FLDA")
                     );
@@ -624,7 +624,7 @@ int dlt_user_log_file_data(DltContext *fileContext, const char *filename, int pa
 /*                If free space < 50% the package won't be transferred. */
                 if (checkUserBufferForFreeSpace() > 0) {
                     pkgNumber++;
-                    readBytes = fread(buffer, sizeof(char), BUFFER_SIZE, file);
+                    readBytes = (uint16_t) fread(buffer, sizeof(char), BUFFER_SIZE, file);
                     int ok;
 
                     uint32_t fserial = getFileSerialNumber(filename, &ok);
@@ -637,7 +637,7 @@ int dlt_user_log_file_data(DltContext *fileContext, const char *filename, int pa
                     DLT_LOG(*fileContext, DLT_LOG_INFO,
                             DLT_STRING("FLDA"),
                             DLT_UINT(fserial),
-                            DLT_UINT(pkgNumber),
+                            DLT_INT(pkgNumber),
                             DLT_RAW(buffer, readBytes),
                             DLT_STRING("FLDA")
                             );
diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
index a5751db..ae6eb55 100644
--- a/src/lib/dlt_user.c
+++ b/src/lib/dlt_user.c
@@ -2530,7 +2530,7 @@ DltReturnValue dlt_user_log_write_sized_string_utils(DltContextData *log, const
         return DLT_RETURN_ERROR;
     }
 
-    arg_size = length + 1;
+    arg_size = (uint16_t) (length + 1);
 
     new_log_size = log->size + arg_size + sizeof(uint16_t);
 
@@ -2582,7 +2582,7 @@ DltReturnValue dlt_user_log_write_sized_string_utils(DltContextData *log, const
             }
 
             max_payload_str_msg -= reduce_size;
-            arg_size -= reduce_size;
+            arg_size -= (uint16_t) reduce_size;
         }
     }
 
@@ -2877,7 +2877,7 @@ DltReturnValue dlt_user_trace_network_segmented_start(uint32_t *id,
         }
 
         /* Write expected segment count */
-        uint16_t segment_count = payload_len / DLT_MAX_TRACE_SEGMENT_SIZE + 1;
+        uint16_t segment_count = (uint16_t) (payload_len / DLT_MAX_TRACE_SEGMENT_SIZE + 1);
 
         /* If segments align perfectly with segment size, avoid sending empty segment */
         if ((payload_len % DLT_MAX_TRACE_SEGMENT_SIZE) == 0)
@@ -3156,7 +3156,7 @@ DltReturnValue dlt_user_trace_network_segmented(DltContext *handle,
         return DLT_RETURN_ERROR;
 
     /* Send as normal trace if possible */
-    if (header_len + payload_len + sizeof(uint16_t) < dlt_user.log_buf_len)
+    if (header_len + payload_len + (uint16_t) sizeof(uint16_t) < dlt_user.log_buf_len)
         return dlt_user_trace_network(handle, nw_trace_type, header_len, header, payload_len, payload);
 
     /* Allocate Memory */
@@ -3286,7 +3286,7 @@ DltReturnValue dlt_user_trace_network_truncated(DltContext *handle,
             header_len = 0;
 
         /* If truncation is allowed, check if we must do it */
-        if ((allow_truncate > 0) && ((header_len + payload_len + sizeof(uint16_t)) > dlt_user.log_buf_len)) {
+        if ((allow_truncate > 0) && ((header_len + payload_len + (uint16_t) sizeof(uint16_t)) > dlt_user.log_buf_len)) {
             /* Identify as truncated */
             if (dlt_user_log_write_string(&log, DLT_TRACE_NW_TRUNCATED) < DLT_RETURN_OK) {
                 dlt_user_free_buffer(&(log.buffer));
@@ -3309,10 +3309,10 @@ DltReturnValue dlt_user_trace_network_truncated(DltContext *handle,
              *  Calculate maximum available space in sending buffer after headers.
              */
 
-            int truncated_payload_len = dlt_user.log_buf_len - log.size - sizeof(uint16_t) - sizeof(uint32_t);
+            uint16_t truncated_payload_len = (uint16_t) (dlt_user.log_buf_len - log.size - sizeof(uint16_t) - sizeof(uint32_t));
 
             /* Write truncated payload */
-            if (dlt_user_log_write_raw(&log, payload, (uint16_t) truncated_payload_len) < DLT_RETURN_OK) {
+            if (dlt_user_log_write_raw(&log, payload, truncated_payload_len) < DLT_RETURN_OK) {
                 dlt_user_free_buffer(&(log.buffer));
                 return DLT_RETURN_ERROR;
             }
@@ -3882,10 +3882,10 @@ DltReturnValue dlt_user_log_send_log(DltContextData *log, int mtype)
 #   ifdef DLT_TEST_ENABLE
 
             if (dlt_user.corrupt_user_header) {
-                userheader.pattern[0] = 0xff;
-                userheader.pattern[1] = 0xff;
-                userheader.pattern[2] = 0xff;
-                userheader.pattern[3] = 0xff;
+                userheader.pattern[0] = (char) 0xff;
+                userheader.pattern[1] = (char) 0xff;
+                userheader.pattern[2] = (char) 0xff;
+                userheader.pattern[3] = (char) 0xff;
             }
 
             if (dlt_user.corrupt_message_size)
@@ -4276,7 +4276,7 @@ DltReturnValue dlt_user_print_msg(DltMessage *msg, DltContextData *log)
     dlt_message_get_extraparameters(msg, 0);
 
     msg->databuffer = log->buffer;
-    msg->datasize = log->size;
+    msg->datasize = (uint32_t) log->size;
     msg->databuffersize = (uint32_t) log->size;
 
     /* Print message as ASCII */