summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarian Biastoch <dbiastoch@de.adit-jv.com>2021-08-03 16:40:45 +0200
committerSaya Sugiura <39760799+ssugiura@users.noreply.github.com>2021-10-05 11:19:26 +0900
commitdaf4247d8cf7570b7541e34af4bd93454e5bb550 (patch)
tree2c83112559b23c206fd7e939f3a64852b541d44c
parentb90a2b3d7cfe4d32dcd142c3591cde5655be60ae (diff)
downloadDLT-daemon-daf4247d8cf7570b7541e34af4bd93454e5bb550.tar.gz
remove clang-tidy analyzer warnings: incompatible pointer type
Removed duplicate "payload" pointer in dlt_client_send functions inside dlt_client.c. This pointer was only needed to avoid one cast within a function call. Now this cast is performed to get rid of clang-tidy analyzer warnings. In addition to that, malloc calls were replaced through calloc to avoid a subsequent memset with zero. Signed-off-by: Darian Biastoch <dbiastoch@de.adit-jv.com>
-rw-r--r--src/lib/dlt_client.c85
1 files changed, 35 insertions, 50 deletions
diff --git a/src/lib/dlt_client.c b/src/lib/dlt_client.c
index cddada7..174cfa0 100644
--- a/src/lib/dlt_client.c
+++ b/src/lib/dlt_client.c
@@ -755,12 +755,11 @@ DltReturnValue dlt_client_send_log_level(DltClient *client, char *apid, char *ct
if (client == NULL)
return ret;
- req = (DltServiceSetLogLevel *)malloc(sizeof(DltServiceSetLogLevel));
+ req = calloc(1, sizeof(DltServiceSetLogLevel));
if (req == NULL)
return ret;
- memset(req, 0, sizeof(DltServiceSetLogLevel));
req->service_id = DLT_SERVICE_ID_SET_LOG_LEVEL;
dlt_set_id(req->apid, apid);
dlt_set_id(req->ctid, ctid);
@@ -866,15 +865,12 @@ DltReturnValue dlt_client_get_software_version(DltClient *client)
DltReturnValue dlt_client_send_trace_status(DltClient *client, char *apid, char *ctid, uint8_t traceStatus)
{
DltServiceSetLogLevel *req;
- uint8_t *payload;
- payload = (uint8_t *)malloc(sizeof(DltServiceSetLogLevel));
+ req = calloc(1,sizeof(DltServiceSetLogLevel));
- if (payload == 0)
+ if (req == 0)
return DLT_RETURN_ERROR;
- req = (DltServiceSetLogLevel *)payload;
- memset(req, 0, sizeof(DltServiceSetLogLevel));
req->service_id = DLT_SERVICE_ID_SET_TRACE_STATUS;
dlt_set_id(req->apid, apid);
dlt_set_id(req->ctid, ctid);
@@ -882,12 +878,13 @@ DltReturnValue dlt_client_send_trace_status(DltClient *client, char *apid, char
dlt_set_id(req->com, "remo");
/* free message */
- if (dlt_client_send_ctrl_msg(client, "APP", "CON", payload, sizeof(DltServiceSetLogLevel)) == DLT_RETURN_ERROR) {
- free(payload);
+ if (dlt_client_send_ctrl_msg(client, "APP", "CON", (uint8_t*) req,
+ sizeof(DltServiceSetLogLevel)) == DLT_RETURN_ERROR) {
+ free(req);
return DLT_RETURN_ERROR;
}
- free(payload);
+ free(req);
return DLT_RETURN_OK;
}
@@ -895,27 +892,24 @@ DltReturnValue dlt_client_send_trace_status(DltClient *client, char *apid, char
DltReturnValue dlt_client_send_default_log_level(DltClient *client, uint8_t defaultLogLevel)
{
DltServiceSetDefaultLogLevel *req;
- uint8_t *payload;
- payload = (uint8_t *)malloc(sizeof(DltServiceSetDefaultLogLevel));
+ req = calloc(1, sizeof(DltServiceSetDefaultLogLevel));
- if (payload == 0)
+ if (req == 0)
return DLT_RETURN_ERROR;
- req = (DltServiceSetDefaultLogLevel *)payload;
-
req->service_id = DLT_SERVICE_ID_SET_DEFAULT_LOG_LEVEL;
req->log_level = defaultLogLevel;
dlt_set_id(req->com, "remo");
/* free message */
- if (dlt_client_send_ctrl_msg(client, "APP", "CON", payload,
+ if (dlt_client_send_ctrl_msg(client, "APP", "CON", (uint8_t*) req,
sizeof(DltServiceSetDefaultLogLevel)) == DLT_RETURN_ERROR) {
- free(payload);
+ free(req);
return DLT_RETURN_ERROR;
}
- free(payload);
+ free(req);
return DLT_RETURN_OK;
}
@@ -923,26 +917,24 @@ DltReturnValue dlt_client_send_default_log_level(DltClient *client, uint8_t defa
DltReturnValue dlt_client_send_all_log_level(DltClient *client, uint8_t LogLevel)
{
DltServiceSetDefaultLogLevel *req;
- uint8_t *payload;
- payload = (uint8_t *)malloc(sizeof(DltServiceSetDefaultLogLevel));
+ req = calloc(1, sizeof(DltServiceSetDefaultLogLevel));
- if (payload == 0)
+ if (req == 0)
return DLT_RETURN_ERROR;
- req = (DltServiceSetDefaultLogLevel *)payload;
-
req->service_id = DLT_SERVICE_ID_SET_ALL_LOG_LEVEL;
req->log_level = LogLevel;
dlt_set_id(req->com, "remo");
/* free message */
- if (dlt_client_send_ctrl_msg(client, "APP", "CON", payload, sizeof(DltServiceSetDefaultLogLevel)) == -1) {
- free(payload);
+ if (dlt_client_send_ctrl_msg(client, "APP", "CON", (uint8_t*) req,
+ sizeof(DltServiceSetDefaultLogLevel)) == -1) {
+ free(req);
return DLT_RETURN_ERROR;
}
- free(payload);
+ free(req);
return DLT_RETURN_OK;
}
@@ -950,27 +942,24 @@ DltReturnValue dlt_client_send_all_log_level(DltClient *client, uint8_t LogLevel
DltReturnValue dlt_client_send_default_trace_status(DltClient *client, uint8_t defaultTraceStatus)
{
DltServiceSetDefaultLogLevel *req;
- uint8_t *payload;
- payload = (uint8_t *)malloc(sizeof(DltServiceSetDefaultLogLevel));
+ req = calloc(1, sizeof(DltServiceSetDefaultLogLevel));
- if (payload == 0)
+ if (req == 0)
return DLT_RETURN_ERROR;
- req = (DltServiceSetDefaultLogLevel *)payload;
-
req->service_id = DLT_SERVICE_ID_SET_DEFAULT_TRACE_STATUS;
req->log_level = defaultTraceStatus;
dlt_set_id(req->com, "remo");
/* free message */
- if (dlt_client_send_ctrl_msg(client, "APP", "CON", payload,
+ if (dlt_client_send_ctrl_msg(client, "APP", "CON", (uint8_t*) req,
sizeof(DltServiceSetDefaultLogLevel)) == DLT_RETURN_ERROR) {
- free(payload);
+ free(req);
return DLT_RETURN_ERROR;
}
- free(payload);
+ free(req);
return DLT_RETURN_OK;
}
@@ -978,33 +967,31 @@ DltReturnValue dlt_client_send_default_trace_status(DltClient *client, uint8_t d
DltReturnValue dlt_client_send_all_trace_status(DltClient *client, uint8_t traceStatus)
{
DltServiceSetDefaultLogLevel *req;
- uint8_t *payload;
if (client == NULL) {
dlt_vlog(LOG_ERR, "%s: Invalid parameters\n", __func__);
return DLT_RETURN_ERROR;
}
- payload = (uint8_t *)malloc(sizeof(DltServiceSetDefaultLogLevel));
+ req = calloc(1, sizeof(DltServiceSetDefaultLogLevel));
- if (payload == 0) {
+ if (req == 0) {
dlt_vlog(LOG_ERR, "%s: Could not allocate memory %zu\n", __func__, sizeof(DltServiceSetDefaultLogLevel));
return DLT_RETURN_ERROR;
}
- req = (DltServiceSetDefaultLogLevel *)payload;
-
req->service_id = DLT_SERVICE_ID_SET_ALL_TRACE_STATUS;
req->log_level = traceStatus;
dlt_set_id(req->com, "remo");
/* free message */
- if (dlt_client_send_ctrl_msg(client, "APP", "CON", payload, sizeof(DltServiceSetDefaultLogLevel)) == -1) {
- free(payload);
+ if (dlt_client_send_ctrl_msg(client, "APP", "CON", (uint8_t*) req,
+ sizeof(DltServiceSetDefaultLogLevel)) == -1) {
+ free(req);;
return DLT_RETURN_ERROR;
}
- free(payload);
+ free(req);
return DLT_RETURN_OK;
}
@@ -1012,25 +999,23 @@ DltReturnValue dlt_client_send_all_trace_status(DltClient *client, uint8_t trace
DltReturnValue dlt_client_send_timing_pakets(DltClient *client, uint8_t timingPakets)
{
DltServiceSetVerboseMode *req;
- uint8_t *payload;
- payload = (uint8_t *)malloc(sizeof(DltServiceSetVerboseMode));
+ req = calloc(1, sizeof(DltServiceSetVerboseMode));
- if (payload == 0)
+ if (req == 0)
return DLT_RETURN_ERROR;
- req = (DltServiceSetVerboseMode *)payload;
-
req->service_id = DLT_SERVICE_ID_SET_TIMING_PACKETS;
req->new_status = timingPakets;
/* free message */
- if (dlt_client_send_ctrl_msg(client, "APP", "CON", payload, sizeof(DltServiceSetVerboseMode)) == DLT_RETURN_ERROR) {
- free(payload);
+ if (dlt_client_send_ctrl_msg(client, "APP", "CON", (uint8_t*) req,
+ sizeof(DltServiceSetVerboseMode)) == DLT_RETURN_ERROR) {
+ free(req);
return DLT_RETURN_ERROR;
}
- free(payload);
+ free(req);
return DLT_RETURN_OK;
}