diff options
| author | Saya Sugiura <ssugiura@jp.adit-jv.com> | 2019-06-12 16:18:02 +0900 |
|---|---|---|
| committer | Saya Sugiura <ssugiura@jp.adit-jv.com> | 2019-06-19 11:00:37 +0900 |
| commit | 6088448cdfe3cd152c53136544acc4ee7a508a84 (patch) | |
| tree | 3b8ed06c2502c8d2daae736b6af2e1d9701f50b4 /src/daemon | |
| parent | 3e73652e5dce1e841d959f521727a0952c2d1c92 (diff) | |
| download | DLT-daemon-6088448cdfe3cd152c53136544acc4ee7a508a84.tar.gz | |
Fix alerts from lgtm
Signed-off-by: Saya Sugiura <ssugiura@jp.adit-jv.com>
Diffstat (limited to 'src/daemon')
| -rw-r--r-- | src/daemon/dlt_daemon_client.c | 16 | ||||
| -rw-r--r-- | src/daemon/dlt_daemon_common.c | 8 |
2 files changed, 11 insertions, 13 deletions
diff --git a/src/daemon/dlt_daemon_client.c b/src/daemon/dlt_daemon_client.c index fd2bde4..e2a0d12 100644 --- a/src/daemon/dlt_daemon_client.c +++ b/src/daemon/dlt_daemon_client.c @@ -1505,7 +1505,8 @@ void dlt_daemon_control_callsw_cinjection(int sock, DLT_MSG_READ_VALUE(id_tmp, ptr, datalength, uint32_t); /* Get service id */ id = DLT_ENDIAN_GET_32(msg->standardheader->htyp, id_tmp); - if ((id >= DLT_DAEMON_INJECTION_MIN) && (id <= DLT_DAEMON_INJECTION_MAX)) { + /* id is always less than DLT_DAEMON_INJECTION_MAX since its type is uinit32_t */ + if (id >= DLT_DAEMON_INJECTION_MIN) { /* This a a real SW-C injection call */ data_length_inject = 0; data_length_inject_tmp = 0; @@ -2123,7 +2124,6 @@ void dlt_daemon_control_set_timing_packets(int sock, void dlt_daemon_control_message_time(int sock, DltDaemon *daemon, DltDaemonLocal *daemon_local, int verbose) { - int ret; DltMessage msg; int32_t len; @@ -2185,12 +2185,12 @@ void dlt_daemon_control_message_time(int sock, DltDaemon *daemon, DltDaemonLocal msg.standardheader->len = DLT_HTOBE_16(((uint16_t)len)); - /* Send message */ - if ((ret = - 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))) {} + /* Send message, ignore return value */ + 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); /* free message */ dlt_message_free(&msg, 0); diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c index 38b94fe..4a39d64 100644 --- a/src/daemon/dlt_daemon_common.c +++ b/src/daemon/dlt_daemon_common.c @@ -1120,9 +1120,8 @@ int dlt_daemon_contexts_load(DltDaemon *daemon, const char *filename, int verbos * We need to check here if there was an error or was it feof.*/ if (ferror(fd)) { dlt_vlog(LOG_WARNING, - "%s fgets(buf,sizeof(buf),fd[%d]) returned NULL. %s\n", + "%s fgets(buf,sizeof(buf),fd) returned NULL. %s\n", __func__, - fd, strerror(errno)); fclose(fd); return -1; @@ -1134,9 +1133,8 @@ int dlt_daemon_contexts_load(DltDaemon *daemon, const char *filename, int verbos } else { dlt_vlog(LOG_WARNING, - "%s fgets(buf,sizeof(buf),fd[%d]) returned NULL. Unknown error.\n", - __func__, - fd); + "%s fgets(buf,sizeof(buf),fd) returned NULL. Unknown error.\n", + __func__); fclose(fd); return -1; } |