From 360ccb0463aa7cf766d3a8228558cdc6478309a1 Mon Sep 17 00:00:00 2001 From: Dinh Cong Toan Date: Thu, 19 Nov 2020 18:41:13 +0700 Subject: 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 --- include/dlt/dlt_common.h | 4 +- src/daemon/dlt-daemon.c | 12 ++--- src/daemon/dlt_daemon_client.c | 24 ++++----- src/daemon/dlt_daemon_common.c | 4 +- src/daemon/dlt_daemon_event_handler.c | 2 +- src/daemon/dlt_daemon_offline_logstorage.c | 2 +- src/daemon/dlt_daemon_socket.c | 2 +- src/examples/dlt-example-user.c | 6 +-- src/gateway/dlt_gateway.c | 4 +- src/lib/dlt_env_ll.c | 2 +- src/lib/dlt_filetransfer.c | 24 ++++----- src/lib/dlt_user.c | 24 ++++----- src/offlinelogstorage/dlt_offline_logstorage.c | 2 +- src/shared/dlt_common.c | 68 +++++++++++++------------- src/shared/dlt_offline_trace.c | 12 ++--- src/tests/dlt-test-stress-client.c | 2 +- 16 files changed, 97 insertions(+), 97 deletions(-) diff --git a/include/dlt/dlt_common.h b/include/dlt/dlt_common.h index 8cd9052..3e7100e 100644 --- a/include/dlt/dlt_common.h +++ b/include/dlt/dlt_common.h @@ -297,7 +297,7 @@ enum { # define DLT_MSG_READ_VALUE(dst, src, length, type) \ { \ - if ((length < 0) || ((length) < ((int32_t)sizeof(type)))) \ + if ((length < 0) || ((length) < ((int32_t) sizeof(type)))) \ { length = -1; } \ else \ { dst = *((type *)src); src += sizeof(type); length -= (int32_t) sizeof(type); } \ @@ -319,7 +319,7 @@ enum { } \ else \ { \ - memcpy(dst, src, length); \ + memcpy(dst, src, (size_t) length); \ dlt_clean_string(dst, length); \ dst[length] = 0; \ src += length; \ diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c index 22ac934..86b88e0 100644 --- a/src/daemon/dlt-daemon.c +++ b/src/daemon/dlt-daemon.c @@ -1612,7 +1612,7 @@ int dlt_daemon_local_ecu_version_init(DltDaemon *daemon, DltDaemonLocal *daemon_ off_t offset = 0; while (!feof(f)) { - offset += fread(version + offset, 1, (size_t) size, f); + offset += (off_t) fread(version + offset, 1, (size_t) size, f); if (ferror(f)) { dlt_log(LOG_WARNING, "Failed to read ECU Software version file.\n"); @@ -1853,16 +1853,16 @@ int dlt_daemon_log_internal(DltDaemon *daemon, DltDaemonLocal *daemon_local, cha DLT_HTYP_PROTOCOL_VERSION1; msg.standardheader->mcnt = uiMsgCount++; - uiExtraSize = DLT_STANDARD_HEADER_EXTRA_SIZE(msg.standardheader->htyp) + - (DLT_IS_HTYP_UEH(msg.standardheader->htyp) ? sizeof(DltExtendedHeader) : 0); - msg.headersize = sizeof(DltStorageHeader) + sizeof(DltStandardHeader) + uiExtraSize; + uiExtraSize = (uint32_t) (DLT_STANDARD_HEADER_EXTRA_SIZE(msg.standardheader->htyp) + + (DLT_IS_HTYP_UEH(msg.standardheader->htyp) ? sizeof(DltExtendedHeader) : 0)); + msg.headersize = (uint32_t) sizeof(DltStorageHeader) + (uint32_t) sizeof(DltStandardHeader) + uiExtraSize; /* Set extraheader */ pStandardExtra = (DltStandardHeaderExtra *)(msg.headerbuffer + sizeof(DltStorageHeader) + sizeof(DltStandardHeader)); dlt_set_id(pStandardExtra->ecu, daemon->ecuid); pStandardExtra->tmsp = DLT_HTOBE_32(dlt_uptime()); - pStandardExtra->seid = DLT_HTOBE_32(getpid()); + pStandardExtra->seid = (unsigned int) DLT_HTOBE_32(getpid()); /* Set extendedheader */ msg.extendedheader = @@ -3054,7 +3054,7 @@ int dlt_daemon_process_user_message_log(DltDaemon *daemon, #else ret = dlt_message_read(&(daemon_local->msg), (unsigned char *)rec->buf + sizeof(DltUserHeader), - (unsigned int) (rec->bytesRcvd - sizeof(DltUserHeader)), + (unsigned int) ((unsigned int) rec->bytesRcvd - sizeof(DltUserHeader)), 0, verbose); diff --git a/src/daemon/dlt_daemon_client.c b/src/daemon/dlt_daemon_client.c index 2b3b7a1..659d086 100644 --- a/src/daemon/dlt_daemon_client.c +++ b/src/daemon/dlt_daemon_client.c @@ -186,7 +186,7 @@ int dlt_daemon_client_send(int sock, if (isatty(sock)) { DLT_DAEMON_SEM_LOCK(); - if ((ret = dlt_daemon_serial_send(sock, data1, size1, data2, size2, daemon->sendserialheader))) { + if ((ret = dlt_daemon_serial_send(sock, data1, size1, data2, size2, (char) daemon->sendserialheader))) { DLT_DAEMON_SEM_FREE(); dlt_vlog(LOG_WARNING, "%s: serial send dlt message failed\n", __func__); return ret; @@ -197,7 +197,7 @@ int dlt_daemon_client_send(int sock, else { DLT_DAEMON_SEM_LOCK(); - if ((ret = dlt_daemon_socket_send(sock, data1, size1, data2, size2, daemon->sendserialheader))) { + if ((ret = dlt_daemon_socket_send(sock, data1, size1, data2, size2, (char) daemon->sendserialheader))) { DLT_DAEMON_SEM_FREE(); dlt_vlog(LOG_WARNING, "%s: socket send dlt message failed\n", __func__); return ret; @@ -958,8 +958,8 @@ void dlt_daemon_control_get_log_info(int sock, if ((req->options == 5) || (req->options == 6) || (req->options == 7)) sizecont += sizeof(int8_t); /* trace status */ - resp.datasize += (uint32_t) (num_applications * (sizeof(uint32_t) /* app_id */ + sizeof(uint16_t) /* count_con_ids */)) + - (num_contexts * sizecont); + resp.datasize += (uint32_t) (((uint32_t) num_applications * (sizeof(uint32_t) /* app_id */ + sizeof(uint16_t) /* count_con_ids */)) + + ((size_t) num_contexts * sizecont)); resp.datasize += (uint32_t) sizeof(uint16_t) /* count_app_ids */; @@ -2225,8 +2225,8 @@ void dlt_daemon_control_message_time(int sock, DltDaemon *daemon, DltDaemonLocal dlt_set_id(msg.extendedheader->ctid, ""); /* context id */ /* prepare length information */ - msg.headersize = sizeof(DltStorageHeader) + sizeof(DltStandardHeader) + sizeof(DltExtendedHeader) + - DLT_STANDARD_HEADER_EXTRA_SIZE(msg.standardheader->htyp); + msg.headersize = (uint32_t) (sizeof(DltStorageHeader) + sizeof(DltStandardHeader) + sizeof(DltExtendedHeader) + + DLT_STANDARD_HEADER_EXTRA_SIZE(msg.standardheader->htyp)); len = (int32_t) (msg.headersize - sizeof(DltStorageHeader) + msg.datasize); @@ -2245,8 +2245,8 @@ void dlt_daemon_control_message_time(int sock, DltDaemon *daemon, DltDaemonLocal dlt_daemon_client_send(sock, daemon, daemon_local, msg.headerbuffer, sizeof(DltStorageHeader), msg.headerbuffer + sizeof(DltStorageHeader), - msg.headersize - sizeof(DltStorageHeader), - msg.databuffer, msg.datasize, verbose); + (int) msg.headersize - (int) sizeof(DltStorageHeader), + msg.databuffer, (int) msg.datasize, verbose); /* free message */ dlt_message_free(&msg, 0); @@ -2407,7 +2407,7 @@ void dlt_daemon_control_service_logstorage(int sock, unsigned int connection_type = 0; DltLogStorage *device = NULL; int device_index = -1; - int i = 0; + uint32_t i = 0; int tmp_errno = 0; @@ -2488,7 +2488,7 @@ void dlt_daemon_control_service_logstorage(int sock, /* Check if the requested device path is already used as log storage device */ if (req_mpoint_st.st_dev == daemon_mpoint_st.st_dev && req_mpoint_st.st_ino == daemon_mpoint_st.st_ino) { - device_index = i; + device_index = (int) i; break; } } @@ -2496,7 +2496,7 @@ void dlt_daemon_control_service_logstorage(int sock, /* Get first available device index here */ if ((connection_type != DLT_OFFLINE_LOGSTORAGE_DEVICE_CONNECTED) && (device_index == -1)) - device_index = i; + device_index = (int) i; } /* It might be possible to sync all caches of all devices */ @@ -2570,7 +2570,7 @@ void dlt_daemon_control_service_logstorage(int sock, daemon, daemon_local, device_index, - daemon_local->flags.offlineLogstorageMaxDevices, + (int) daemon_local->flags.offlineLogstorageMaxDevices, verbose); dlt_logstorage_device_disconnected(&(daemon->storage_handle[device_index]), diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c index b57b33e..5273433 100644 --- a/src/daemon/dlt_daemon_common.c +++ b/src/daemon/dlt_daemon_common.c @@ -845,7 +845,7 @@ DltDaemonContext *dlt_daemon_context_add(DltDaemon *daemon, if ((user_list->num_contexts % DLT_DAEMON_CONTEXT_ALLOC_SIZE) == 0) { /* allocate memory for context in steps of DLT_DAEMON_CONTEXT_ALLOC_SIZE, e.g 100 */ old = user_list->contexts; - user_list->contexts = (DltDaemonContext *)malloc(sizeof(DltDaemonContext) * + user_list->contexts = (DltDaemonContext *)malloc((size_t) sizeof(DltDaemonContext) * ((user_list->num_contexts / DLT_DAEMON_CONTEXT_ALLOC_SIZE) + 1) * DLT_DAEMON_CONTEXT_ALLOC_SIZE); @@ -858,7 +858,7 @@ DltDaemonContext *dlt_daemon_context_add(DltDaemon *daemon, memcpy(user_list->contexts, old, - sizeof(DltDaemonContext) * user_list->num_contexts); + (size_t) sizeof(DltDaemonContext) * user_list->num_contexts); free(old); } } diff --git a/src/daemon/dlt_daemon_event_handler.c b/src/daemon/dlt_daemon_event_handler.c index 6c33d23..3cecf64 100644 --- a/src/daemon/dlt_daemon_event_handler.c +++ b/src/daemon/dlt_daemon_event_handler.c @@ -111,7 +111,7 @@ static void dlt_event_handler_enable_fd(DltEventHandler *ev, int fd, int mask) if (ev->max_nfds <= ev->nfds) { int i = (int) ev->nfds; int max = (int) (2 * ev->max_nfds); - struct pollfd *tmp = realloc(ev->pfd, max * sizeof(*ev->pfd)); + struct pollfd *tmp = realloc(ev->pfd, (size_t) (max) * sizeof(*ev->pfd)); if (!tmp) { dlt_log(LOG_CRIT, diff --git a/src/daemon/dlt_daemon_offline_logstorage.c b/src/daemon/dlt_daemon_offline_logstorage.c index 8471dc2..b56aade 100644 --- a/src/daemon/dlt_daemon_offline_logstorage.c +++ b/src/daemon/dlt_daemon_offline_logstorage.c @@ -382,7 +382,7 @@ DLT_STATIC DltReturnValue dlt_daemon_logstorage_send_log_level(DltDaemon *daemon if (strncmp(ecuid, daemon->ecuid, DLT_ID_SIZE) == 0) { old_log_level = context->storage_log_level; - context->storage_log_level = DLT_OFFLINE_LOGSTORAGE_MAX(loglevel, + context->storage_log_level = (int8_t) DLT_OFFLINE_LOGSTORAGE_MAX(loglevel, context->storage_log_level); if (context->storage_log_level > old_log_level) { diff --git a/src/daemon/dlt_daemon_socket.c b/src/daemon/dlt_daemon_socket.c index 410c702..0dd22a9 100644 --- a/src/daemon/dlt_daemon_socket.c +++ b/src/daemon/dlt_daemon_socket.c @@ -204,7 +204,7 @@ int dlt_daemon_socket_sendreliable(int sock, void *data_buffer, int message_size "%s: socket send failed [errno: %d]!\n", __func__, errno); return DLT_DAEMON_ERROR_SEND_FAILED; } else { - data_sent += ret; + data_sent += (int) ret; } } diff --git a/src/examples/dlt-example-user.c b/src/examples/dlt-example-user.c index fabb1d7..66515c6 100644 --- a/src/examples/dlt-example-user.c +++ b/src/examples/dlt-example-user.c @@ -247,8 +247,8 @@ int main(int argc, char *argv[]) message = argv[index]; } else { /* allocate raw buffer */ - message = calloc(sizeof(char), rvalue); - memset(message, 'X', rvalue - 1); + message = calloc(sizeof(char), (size_t) rvalue); + memset(message, 'X', (size_t) (rvalue - 1)) ; } if (message == 0) { @@ -315,7 +315,7 @@ int main(int argc, char *argv[]) delay = 500; if (tvalue) - dlt_set_resend_timeout_atexit(atoi(tvalue)); + dlt_set_resend_timeout_atexit((uint32_t) atoi(tvalue)); if (gflag) { /* DLT messages to test Fibex non-verbose description: dlt-example-non-verbose.xml */ diff --git a/src/gateway/dlt_gateway.c b/src/gateway/dlt_gateway.c index 27d1f49..4174c89 100644 --- a/src/gateway/dlt_gateway.c +++ b/src/gateway/dlt_gateway.c @@ -1254,7 +1254,7 @@ DLT_STATIC int dlt_gateway_control_service_logstorage(DltDaemon *daemon, int verbose) { unsigned int connection_type = 0; - int i = 0; + uint32_t i = 0; if (daemon_local->flags.offlineLogstorageMaxDevices <= 0) { dlt_log(LOG_INFO, @@ -1269,7 +1269,7 @@ DLT_STATIC int dlt_gateway_control_service_logstorage(DltDaemon *daemon, /* Check if log level of running application needs an update */ dlt_daemon_logstorage_update_application_loglevel(daemon, daemon_local, - i, + (int) i, verbose); } 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 */ diff --git a/src/offlinelogstorage/dlt_offline_logstorage.c b/src/offlinelogstorage/dlt_offline_logstorage.c index 85b215b..f102029 100644 --- a/src/offlinelogstorage/dlt_offline_logstorage.c +++ b/src/offlinelogstorage/dlt_offline_logstorage.c @@ -326,7 +326,7 @@ void dlt_logstorage_free(DltLogStorage *handle, int reason) DLT_STATIC int dlt_logstorage_read_list_of_names(char **names, char *value) { int i = 0; - int y = 0; + size_t y = 0; size_t len = 0; char *tok; int num = 1; diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c index 3aae317..1ae56c1 100644 --- a/src/shared/dlt_common.c +++ b/src/shared/dlt_common.c @@ -991,14 +991,14 @@ int dlt_message_read(DltMessage *msg, uint8_t *buffer, unsigned int length, int msg->standardheader = (DltStandardHeader *)(msg->headerbuffer + sizeof(DltStorageHeader)); /* calculate complete size of headers */ - extra_size = DLT_STANDARD_HEADER_EXTRA_SIZE(msg->standardheader->htyp) + - (DLT_IS_HTYP_UEH(msg->standardheader->htyp) ? sizeof(DltExtendedHeader) : 0); + extra_size = (uint32_t) (DLT_STANDARD_HEADER_EXTRA_SIZE(msg->standardheader->htyp) + + (DLT_IS_HTYP_UEH(msg->standardheader->htyp) ? sizeof(DltExtendedHeader) : 0)); msg->headersize = (uint32_t) (sizeof(DltStorageHeader) + sizeof(DltStandardHeader) + extra_size); - msg->datasize = DLT_BETOH_16(msg->standardheader->len) - (msg->headersize - sizeof(DltStorageHeader)); + msg->datasize = (uint32_t) DLT_BETOH_16(msg->standardheader->len) - msg->headersize + (uint32_t) sizeof(DltStorageHeader); /* calculate complete size of payload */ int32_t temp_datasize; - temp_datasize = DLT_BETOH_16(msg->standardheader->len) - (msg->headersize - sizeof(DltStorageHeader)); + temp_datasize = DLT_BETOH_16(msg->standardheader->len) - (int32_t) msg->headersize + (int32_t) sizeof(DltStorageHeader); /* check data size */ if (temp_datasize < 0) { @@ -1196,7 +1196,7 @@ DltReturnValue dlt_file_read_header(DltFile *file, int verbose) if (dlt_check_storageheader(file->msg.storageheader) != DLT_RETURN_TRUE) { /* Shift the position back to the place where it stared to read + 1 */ if (fseek(file->handle, - 1 - (sizeof(DltStorageHeader) + sizeof(DltStandardHeader)), + (long) (1 - (sizeof(DltStorageHeader) + sizeof(DltStandardHeader))), SEEK_CUR) < 0) { dlt_log(LOG_WARNING, "DLT storage header pattern not found!\n"); return DLT_RETURN_ERROR; @@ -1209,13 +1209,13 @@ DltReturnValue dlt_file_read_header(DltFile *file, int verbose) } /* calculate complete size of headers */ - file->msg.headersize = sizeof(DltStorageHeader) + sizeof(DltStandardHeader) + + file->msg.headersize = (uint32_t) (sizeof(DltStorageHeader) + sizeof(DltStandardHeader) + DLT_STANDARD_HEADER_EXTRA_SIZE(file->msg.standardheader->htyp) + - (DLT_IS_HTYP_UEH(file->msg.standardheader->htyp) ? sizeof(DltExtendedHeader) : 0); + (DLT_IS_HTYP_UEH(file->msg.standardheader->htyp) ? sizeof(DltExtendedHeader) : 0)); /* calculate complete size of payload */ int32_t temp_datasize; - temp_datasize = DLT_BETOH_16(file->msg.standardheader->len) + sizeof(DltStorageHeader) - file->msg.headersize; + temp_datasize = DLT_BETOH_16(file->msg.standardheader->len) + (int32_t) sizeof(DltStorageHeader) - (int32_t) file->msg.headersize; /* check data size */ if (temp_datasize < 0) { @@ -1305,13 +1305,13 @@ DltReturnValue dlt_file_read_header_raw(DltFile *file, int resync, int verbose) /* no check for storage header id*/ /* calculate complete size of headers */ - file->msg.headersize = sizeof(DltStorageHeader) + sizeof(DltStandardHeader) + + file->msg.headersize = (uint32_t) (sizeof(DltStorageHeader) + sizeof(DltStandardHeader) + DLT_STANDARD_HEADER_EXTRA_SIZE(file->msg.standardheader->htyp) + - (DLT_IS_HTYP_UEH(file->msg.standardheader->htyp) ? sizeof(DltExtendedHeader) : 0); + (DLT_IS_HTYP_UEH(file->msg.standardheader->htyp) ? sizeof(DltExtendedHeader) : 0)); /* calculate complete size of payload */ int32_t temp_datasize; - temp_datasize = DLT_BETOH_16(file->msg.standardheader->len) + sizeof(DltStorageHeader) - file->msg.headersize; + temp_datasize = DLT_BETOH_16(file->msg.standardheader->len) + (int32_t) sizeof(DltStorageHeader) - (int32_t) file->msg.headersize; /* check data size */ if (temp_datasize < 0) { @@ -1547,7 +1547,7 @@ DltReturnValue dlt_file_read(DltFile *file, int verbose) /* filter is disabled */ /* skip additional header parameters and payload data */ if (fseek(file->handle, - file->msg.headersize - sizeof(DltStorageHeader) - sizeof(DltStandardHeader) + file->msg.datasize, + (long) (file->msg.headersize - sizeof(DltStorageHeader) - sizeof(DltStandardHeader) + file->msg.datasize), SEEK_CUR)) { dlt_vlog(LOG_WARNING, @@ -2202,8 +2202,8 @@ DltReturnValue dlt_set_storageheader(DltStorageHeader *storageheader, const char #if defined(_MSC_VER) storageheader->microseconds = 0; #else - storageheader->seconds = (time_t)tv.tv_sec; /* value is long */ - storageheader->microseconds = (int32_t)tv.tv_usec; /* value is long */ + storageheader->seconds = (uint32_t) tv.tv_sec; /* value is long */ + storageheader->microseconds = (int32_t) tv.tv_usec; /* value is long */ #endif return DLT_RETURN_OK; @@ -2261,7 +2261,7 @@ DltReturnValue dlt_buffer_init_static_server(DltBuffer *buf, const unsigned char head->write = 0; head->count = 0; buf->mem = (unsigned char *)(buf->shm + sizeof(DltBufferHead)); - buf->size = (unsigned int) buf->min_size - sizeof(DltBufferHead); + buf->size = (unsigned int) buf->min_size - (unsigned int) sizeof(DltBufferHead); /* clear memory */ memset(buf->mem, 0, buf->size); @@ -2433,7 +2433,7 @@ int dlt_buffer_check_size(DltBuffer *buf, int needed) if (buf == NULL) return DLT_RETURN_WRONG_PARAMETER; - if ((buf->size + sizeof(DltBufferHead) + needed) > buf->max_size) + if ((buf->size + sizeof(DltBufferHead) + (size_t) needed) > buf->max_size) return DLT_RETURN_ERROR; return DLT_RETURN_OK; @@ -3304,7 +3304,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, if ((*datalength) < 0) return DLT_RETURN_ERROR; - length = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); + length = (uint16_t) DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); } else { length = (uint16_t)byteLength; @@ -3316,7 +3316,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, if ((*datalength) < 0) return DLT_RETURN_ERROR; - length2 = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); + length2 = (uint16_t) DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); if ((*datalength) < length2) return DLT_RETURN_ERROR; @@ -3339,7 +3339,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, if ((*datalength) < 0) return DLT_RETURN_ERROR; - length2 = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); + length2 = (uint16_t) DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); if ((*datalength) < length2) return DLT_RETURN_ERROR; @@ -3452,13 +3452,13 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, if ((*datalength) < 0) return DLT_RETURN_ERROR; - length2 = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); + length2 = (uint16_t) DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); DLT_MSG_READ_VALUE(value16u_tmp, *ptr, *datalength, uint16_t); if ((*datalength) < 0) return DLT_RETURN_ERROR; - length3 = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); + length3 = (uint16_t) DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); if ((*datalength) < length2) return DLT_RETURN_ERROR; @@ -3550,7 +3550,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, if ((*datalength) < 0) return DLT_RETURN_ERROR; - value16i = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16i_tmp); + value16i = (int16_t) DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16i_tmp); snprintf(text, textlength, "%hd", value16i); } else { @@ -3561,7 +3561,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, if ((*datalength) < 0) return DLT_RETURN_ERROR; - value16u = DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); + value16u = (uint16_t) DLT_ENDIAN_GET_16(msg->standardheader->htyp, value16u_tmp); snprintf(text, textlength, "%hu", value16u); } @@ -3577,7 +3577,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, if ((*datalength) < 0) return DLT_RETURN_ERROR; - value32i = DLT_ENDIAN_GET_32(msg->standardheader->htyp, (uint32_t)value32i_tmp); + value32i = (int32_t) DLT_ENDIAN_GET_32(msg->standardheader->htyp, (uint32_t)value32i_tmp); snprintf(text, textlength, "%d", value32i); } else { @@ -3604,7 +3604,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, if ((*datalength) < 0) return DLT_RETURN_ERROR; - value64i = DLT_ENDIAN_GET_64(msg->standardheader->htyp, (uint64_t)value64i_tmp); + value64i = (int64_t) DLT_ENDIAN_GET_64(msg->standardheader->htyp, (uint64_t)value64i_tmp); #if defined (__WIN32__) && !defined(_MSC_VER) snprintf(text, textlength, "%I64d", value64i); #else @@ -3632,7 +3632,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, case DLT_TYLE_128BIT: { if (*datalength >= 16) - dlt_print_hex_string(text, textlength, *ptr, 16); + dlt_print_hex_string(text, (int) textlength, *ptr, 16); if ((*datalength) < 16) return DLT_RETURN_ERROR; @@ -3716,7 +3716,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, memcpy(&value32f_tmp_int32i, &value32f_tmp, sizeof(float32_t)); value32f_tmp_int32i_swaped = - DLT_ENDIAN_GET_32(msg->standardheader->htyp, (uint32_t)value32f_tmp_int32i); + (int32_t) DLT_ENDIAN_GET_32(msg->standardheader->htyp, (uint32_t)value32f_tmp_int32i); memcpy(&value32f, &value32f_tmp_int32i_swaped, sizeof(float32_t)); snprintf(text, textlength, "%g", value32f); } @@ -3741,7 +3741,7 @@ DltReturnValue dlt_message_argument_print(DltMessage *msg, memcpy(&value64f_tmp_int64i, &value64f_tmp, sizeof(float64_t)); value64f_tmp_int64i_swaped = - DLT_ENDIAN_GET_64(msg->standardheader->htyp, (uint64_t)value64f_tmp_int64i); + (int64_t) DLT_ENDIAN_GET_64(msg->standardheader->htyp, (uint64_t)value64f_tmp_int64i); memcpy(&value64f, &value64f_tmp_int64i_swaped, sizeof(float64_t)); #ifdef __arm__ snprintf(text, textlength, "ILLEGAL"); @@ -3898,7 +3898,7 @@ int dlt_set_loginfo_parse_service_id(char *resp_text, service_opt_str[0] = *(resp_text + GET_LOG_INFO_LENGTH + 1); service_opt_str[1] = *(resp_text + GET_LOG_INFO_LENGTH + 2); service_opt_str[2] = 0; - *service_opt = atoi(service_opt_str); + *service_opt = (uint8_t) atoi(service_opt_str); } return ret; @@ -3959,7 +3959,7 @@ void dlt_getloginfo_conv_ascii_to_id(char *rp, int *rp_count, char *wp, int len) for (count = 0; count < len; count++) { number16[0] = *(rp + *rp_count + 0); number16[1] = *(rp + *rp_count + 1); - *(wp + count) = strtol(number16, &endptr, 16); + *(wp + count) = (char) strtol(number16, &endptr, 16); *rp_count += 3; } @@ -3984,17 +3984,17 @@ void dlt_hex_ascii_to_binary(const char *ptr, uint8_t *binary, int *size) found = 0; if ((ch >= '0') && (ch <= '9')) { - binary[pos] = (binary[pos] << 4) + (ch - '0'); + binary[pos] = (uint8_t) ((binary[pos] << 4) + (ch - '0')); found = 1; } else if ((ch >= 'A') && (ch <= 'F')) { - binary[pos] = (binary[pos] << 4) + (ch - 'A' + 10); + binary[pos] = (uint8_t) ((binary[pos] << 4) + (ch - 'A' + 10)); found = 1; } else if ((ch >= 'a') && (ch <= 'f')) { - binary[pos] = (binary[pos] << 4) + (ch - 'a' + 10); + binary[pos] = (uint8_t) ((binary[pos] << 4) + (ch - 'a' + 10)); found = 1; } @@ -4102,7 +4102,7 @@ int dlt_execute_command(char *filename, char *command, ...){ va_end(val); /* Allocate args, put references to command */ - args = (char **) malloc(argc * sizeof(char*)); + args = (char **) malloc( (uint32_t) argc * sizeof(char*)); args[0] = command; va_start(val, command); diff --git a/src/shared/dlt_offline_trace.c b/src/shared/dlt_offline_trace.c index 2d70a77..909252b 100644 --- a/src/shared/dlt_offline_trace.c +++ b/src/shared/dlt_offline_trace.c @@ -85,7 +85,7 @@ unsigned int dlt_offline_trace_storage_dir_info(char *path, char *file_name, cha return 0; for (i = 0; i < cnt; i++) { - int len = 0; + size_t len = 0; len = strlen(file_name); if ((strncmp(files[i]->d_name, file_name, len) == 0) && @@ -166,7 +166,7 @@ unsigned int dlt_offline_trace_get_idx_of_log_file(char *file) token = strtok(NULL, d); if (token != NULL) - idx = strtol(token, NULL, 10); + idx = (unsigned int) strtol(token, NULL, 10); else idx = 0; @@ -307,7 +307,7 @@ int dlt_offline_trace_delete_oldest_file(DltOfflineTrace *trace) if (0 == stat(filename, &status)) { if ((time_oldest == 0) || (status.st_mtime < time_oldest)) { time_oldest = status.st_mtime; - size_oldest = status.st_size; + size_oldest = (unsigned long) status.st_size; strncpy(filename_oldest, filename, PATH_MAX); filename_oldest[PATH_MAX] = 0; } @@ -414,21 +414,21 @@ DltReturnValue dlt_offline_trace_write(DltOfflineTrace *trace, /* write data into log file */ if (data1 && (trace->ohandle >= 0)) { - if (write(trace->ohandle, data1, size1) != size1) { + if (write(trace->ohandle, data1, (size_t) size1) != size1) { printf("Offline trace write failed!\n"); return DLT_RETURN_ERROR; } } if (data2 && (trace->ohandle >= 0)) { - if (write(trace->ohandle, data2, size2) != size2) { + if (write(trace->ohandle, data2, (size_t) size2) != size2) { printf("Offline trace write failed!\n"); return DLT_RETURN_ERROR; } } if (data3 && (trace->ohandle >= 0)) { - if (write(trace->ohandle, data3, size3) != size3) { + if (write(trace->ohandle, data3, (size_t) size3) != size3) { printf("Offline trace write failed!\n"); return DLT_RETURN_ERROR; } diff --git a/src/tests/dlt-test-stress-client.c b/src/tests/dlt-test-stress-client.c index 1210386..e435a00 100644 --- a/src/tests/dlt-test-stress-client.c +++ b/src/tests/dlt-test-stress-client.c @@ -447,7 +447,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data) length_tmp = 0; /* the macro can set this variable to -1 */ ptr = message->databuffer; - datalength = message->datasize; + datalength = (int32_t) message->datasize; /* first read the type info of the first argument: must be string */ DLT_MSG_READ_VALUE(type_info_tmp, ptr, datalength, uint32_t); -- cgit v1.2.1