diff options
author | Dinh Cong Toan <toan.dinhcong@vn.bosch.com> | 2020-11-19 18:41:13 +0700 |
---|---|---|
committer | Saya Sugiura <39760799+ssugiura@users.noreply.github.com> | 2021-01-06 09:27:28 +0900 |
commit | 360ccb0463aa7cf766d3a8228558cdc6478309a1 (patch) | |
tree | 9a324da77335ab1ae25e614c892ad98acac030dd /src/daemon | |
parent | 906578850094f8f5e9ce488c71ad831b2f35330c (diff) | |
download | DLT-daemon-360ccb0463aa7cf766d3a8228558cdc6478309a1.tar.gz |
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>
Diffstat (limited to 'src/daemon')
-rw-r--r-- | src/daemon/dlt-daemon.c | 12 | ||||
-rw-r--r-- | src/daemon/dlt_daemon_client.c | 24 | ||||
-rw-r--r-- | src/daemon/dlt_daemon_common.c | 4 | ||||
-rw-r--r-- | src/daemon/dlt_daemon_event_handler.c | 2 | ||||
-rw-r--r-- | src/daemon/dlt_daemon_offline_logstorage.c | 2 | ||||
-rw-r--r-- | src/daemon/dlt_daemon_socket.c | 2 |
6 files changed, 23 insertions, 23 deletions
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; } } |