summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/tests/dlt-test-client.c38
-rw-r--r--src/tests/dlt-test-init-free.c4
-rw-r--r--src/tests/dlt-test-multi-process-client.c10
-rw-r--r--src/tests/dlt-test-multi-process.c12
-rw-r--r--src/tests/dlt-test-non-verbose.c4
-rw-r--r--src/tests/dlt-test-stress-client.c2
-rw-r--r--src/tests/dlt-test-stress-user.c2
-rw-r--r--src/tests/dlt-test-stress.c6
-rw-r--r--src/tests/dlt-test-user.c32
9 files changed, 55 insertions, 55 deletions
diff --git a/src/tests/dlt-test-client.c b/src/tests/dlt-test-client.c
index e969df9..edac717 100644
--- a/src/tests/dlt-test-client.c
+++ b/src/tests/dlt-test-client.c
@@ -476,7 +476,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
length = 0; /* the macro can set this variable to -1 */
length_tmp = 0;
ptr = message->databuffer;
- datalength = message->datasize;
+ datalength = (int32_t) message->datasize;
/* Log message */
if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin)) == DLT_TYPE_LOG) {
@@ -664,7 +664,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
id = 0;
id_tmp = 0;
ptr = message->databuffer;
- datalength = message->datasize;
+ datalength = (int32_t) message->datasize;
slen = -1;
tc_old = dltdata->test_counter_macro[2];
@@ -674,7 +674,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
id = DLT_ENDIAN_GET_32(message->standardheader->htyp, id_tmp);
/* Length of string */
- datalength -= sizeof(uint16_t);
+ datalength -= (int32_t) sizeof(uint16_t);
ptr += sizeof(uint16_t);
switch (id) {
@@ -850,7 +850,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
slen = strlen("raw") + 1;
datalength -= slen;
ptr += slen;
- datalength -= sizeof(uint16_t);
+ datalength -= (int32_t) sizeof(uint16_t);
ptr += sizeof(uint16_t);
if (datalength == 10)
@@ -901,7 +901,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);
@@ -1076,7 +1076,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
length = 0, 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);
@@ -1159,7 +1159,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
length = 0, length_tmp = 0; /* the macro can set this variable to -1 */
ptr = message->databuffer;
- datalength = message->datasize;
+ datalength = (int32_t) message->datasize;
DLT_MSG_READ_VALUE(type_info_tmp, ptr, datalength, uint32_t);
type_info = DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp);
@@ -1264,7 +1264,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
length = 0, length_tmp = 0; /* the macro can set this variable to -1 */
ptr = message->databuffer;
- datalength = message->datasize;
+ datalength = (int32_t) message->datasize;
/* NWST */
DLT_MSG_READ_VALUE(type_info_tmp, ptr, datalength, uint32_t);
@@ -1361,7 +1361,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
length = 0, length_tmp = 0; /* the macro can set this variable to -1 */
ptr = message->databuffer;
- datalength = message->datasize;
+ datalength = (int32_t) message->datasize;
/* NWCH */
DLT_MSG_READ_VALUE(type_info_tmp, ptr, datalength, uint32_t);
@@ -1423,7 +1423,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
length = 0, length_tmp = 0; /* the macro can set this variable to -1 */
ptr = message->databuffer;
- datalength = message->datasize;
+ datalength = (int32_t) message->datasize;
/* NWEN */
DLT_MSG_READ_VALUE(type_info_tmp, ptr, datalength, uint32_t);
@@ -1531,7 +1531,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
length = 0;
length_tmp = 0; /* the macro can set this variable to -1 */
ptr = message->databuffer;
- datalength = message->datasize;
+ datalength = (int32_t) message->datasize;
/* Log message */
if ((DLT_GET_MSIN_MSTP(message->extendedheader->msin)) == DLT_TYPE_LOG) {
@@ -1709,7 +1709,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
id = 0;
id_tmp = 0;
ptr = message->databuffer;
- datalength = message->datasize;
+ datalength = (int32_t) message->datasize;
slen = -1;
tc_old = dltdata->test_counter_function[2];
@@ -1924,7 +1924,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: should be string */
DLT_MSG_READ_VALUE(type_info_tmp, ptr, datalength, uint32_t);
@@ -2100,7 +2100,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: should be string */
DLT_MSG_READ_VALUE(type_info_tmp, ptr, datalength, uint32_t);
@@ -2183,7 +2183,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
length = 0, length_tmp = 0; /* the macro can set this variable to -1 */
ptr = message->databuffer;
- datalength = message->datasize;
+ datalength = (int32_t) message->datasize;
DLT_MSG_READ_VALUE(type_info_tmp, ptr, datalength, uint32_t);
type_info = DLT_ENDIAN_GET_32(message->standardheader->htyp, type_info_tmp);
@@ -2288,7 +2288,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
length = 0, length_tmp = 0; /* the macro can set this variable to -1 */
ptr = message->databuffer;
- datalength = message->datasize;
+ datalength = (int32_t) message->datasize;
/* NWST */
DLT_MSG_READ_VALUE(type_info_tmp, ptr, datalength, uint32_t);
@@ -2385,7 +2385,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
length = 0, length_tmp = 0; /* the macro can set this variable to -1 */
ptr = message->databuffer;
- datalength = message->datasize;
+ datalength = (int32_t) message->datasize;
/* NWCH */
DLT_MSG_READ_VALUE(type_info_tmp, ptr, datalength, uint32_t);
@@ -2447,7 +2447,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
length = 0, length_tmp = 0; /* the macro can set this variable to -1 */
ptr = message->databuffer;
- datalength = message->datasize;
+ datalength = (int32_t) message->datasize;
/* NWEN */
DLT_MSG_READ_VALUE(type_info_tmp, ptr, datalength, uint32_t);
@@ -2510,7 +2510,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
iov[1].iov_base = message->databuffer;
iov[1].iov_len = message->datasize;
- bytes_written = writev(dltdata->ohandle, iov, 2);
+ bytes_written = (int) writev(dltdata->ohandle, iov, 2);
if (0 > bytes_written) {
printf("dlt_testclient_message_callback, error in: writev(dltdata->ohandle, iov, 2)\n");
diff --git a/src/tests/dlt-test-init-free.c b/src/tests/dlt-test-init-free.c
index 35b8803..6bfee15 100644
--- a/src/tests/dlt-test-init-free.c
+++ b/src/tests/dlt-test-init-free.c
@@ -41,7 +41,7 @@ int num_repetitions;
int main(int argc, char **argv)
{
if (argc > 1)
- num_repetitions = strtol(argv[1], 0, 10);
+ num_repetitions = (int) strtol(argv[1], 0, 10);
else
num_repetitions = 1000;
@@ -113,7 +113,7 @@ void exec(const char *cmd, char *buffer, size_t length)
if ((pipe = popen(cmd, "r")) == NULL)
return;
- while (fgets(buffer, length, pipe) != NULL);
+ while (fgets(buffer, (int) length, pipe) != NULL);
if (pipe != NULL)
pclose(pipe);
diff --git a/src/tests/dlt-test-multi-process-client.c b/src/tests/dlt-test-multi-process-client.c
index f263374..56b6d48 100644
--- a/src/tests/dlt-test-multi-process-client.c
+++ b/src/tests/dlt-test-multi-process-client.c
@@ -268,7 +268,7 @@ void print_stats(s_statistics stats, s_parameters params)
}
fflush(stdout);
- last_print_time = time(NULL);
+ last_print_time = (int) time(NULL);
}
/**
* Callback for dlt client
@@ -291,15 +291,15 @@ int receive(DltMessage *msg, void *data)
if (stats.first_message_time == 0)
stats.first_message_time = time(NULL);
- int buflen = msg->datasize + 1;
- char *buf = malloc(buflen);
+ int buflen = (int) msg->datasize + 1;
+ char *buf = malloc((size_t) buflen);
if (buf == 0) {
printf("Out of memory\n");
return -1;
}
- memset(buf, 0, buflen);
+ memset(buf, 0, (size_t) buflen);
dlt_message_payload(msg, buf, buflen - 1, DLT_OUTPUT_ASCII, 0);
@@ -320,7 +320,7 @@ int receive(DltMessage *msg, void *data)
iov[1].iov_base = msg->databuffer;
iov[1].iov_len = msg->datasize;
- stats.output_bytes += writev(params->output_handle, iov, 2);
+ stats.output_bytes += (int) writev(params->output_handle, iov, 2);
}
if (params->messages_left < 1)
diff --git a/src/tests/dlt-test-multi-process.c b/src/tests/dlt-test-multi-process.c
index 9572420..8796568 100644
--- a/src/tests/dlt-test-multi-process.c
+++ b/src/tests/dlt-test-multi-process.c
@@ -343,7 +343,7 @@ void do_logging(s_thread_data *data)
int msgs_left = data->params.nmsgs;
- logmsg = calloc(1, data->params.nloglength + 1);
+ logmsg = calloc(1, (size_t) (data->params.nloglength + 1));
if (logmsg == NULL) {
printf("Error allocate memory for message.\n");
DLT_UNREGISTER_CONTEXT(mycontext);
@@ -356,7 +356,7 @@ void do_logging(s_thread_data *data)
{
n = 'A' + (n - 91) % 26;
}
- logmsg[i] = n;
+ logmsg[i] = (char) n;
}
while (msgs_left-- > 0) {
@@ -387,21 +387,21 @@ void run_threads(s_parameters params)
char apid_name[256];
int i;
- srand(getpid());
+ srand((unsigned int) getpid());
snprintf(apid, 5, "MT%02u", pidcount);
snprintf(apid_name, 256, "Apps %s.", apid);
DLT_REGISTER_APP(apid, apid_name);
- thread_data = calloc(params.nthreads, sizeof(s_thread_data));
+ thread_data = calloc( (size_t) params.nthreads, sizeof(s_thread_data));
if (thread_data == NULL) {
printf("Error allocate memory for thread data.\n");
abort();
}
for (i = 0; i < params.nthreads; i++) {
- thread_data[i].tidcount = i;
+ thread_data[i].tidcount = (unsigned int) i;
thread_data[i].params = params;
thread_data[i].pidcount = pidcount;
@@ -427,7 +427,7 @@ void run_threads(s_parameters params)
*/
int wait_for_death()
{
- int pids_left = pidcount;
+ int pids_left = (int) pidcount;
while (pids_left > 0) {
int status;
diff --git a/src/tests/dlt-test-non-verbose.c b/src/tests/dlt-test-non-verbose.c
index cac4b94..6cc7938 100644
--- a/src/tests/dlt-test-non-verbose.c
+++ b/src/tests/dlt-test-non-verbose.c
@@ -173,7 +173,7 @@ int test_macro_interface(void)
for(num2 = 0 ; num2 < 10 ; num2++)
{
- buffer[num2] = num2;
+ buffer[num2] = (char) num2;
}
DLT_LOG_ID(context_macro_test, DLT_LOG_INFO, 14,
DLT_STRING("raw"), DLT_RAW(buffer, 10));
@@ -300,7 +300,7 @@ int test_function_interface(void)
for(num2 = 0 ; num2 < 10 ; num2++)
{
- buffer[num2] = num2;
+ buffer[num2] = (char) num2;
}
if (dlt_user_log_write_start_id(&(context_function_test),
diff --git a/src/tests/dlt-test-stress-client.c b/src/tests/dlt-test-stress-client.c
index 0a4c101..1210386 100644
--- a/src/tests/dlt-test-stress-client.c
+++ b/src/tests/dlt-test-stress-client.c
@@ -520,7 +520,7 @@ int dlt_testclient_message_callback(DltMessage *message, void *data)
iov[1].iov_base = message->databuffer;
iov[1].iov_len = message->datasize;
- bytes_written = writev(dltdata->ohandle, iov, 2);
+ bytes_written = (int) writev(dltdata->ohandle, iov, 2);
if (0 > bytes_written) {
printf("dlt_testclient_message_callback, error when: writev(dltdata->ohandle, iov, 2) \n");
diff --git a/src/tests/dlt-test-stress-user.c b/src/tests/dlt-test-stress-user.c
index 3dc5925..0a01d54 100644
--- a/src/tests/dlt-test-stress-user.c
+++ b/src/tests/dlt-test-stress-user.c
@@ -233,7 +233,7 @@ int testall(int count, int repeat, int delay, int size)
struct timespec ts;
for (num = 0; num < size; num++)
- buffer[num] = num;
+ buffer[num] = (char) num;
/* Test All: Test all start */
/*printf("Test1: Test all\n"); */
diff --git a/src/tests/dlt-test-stress.c b/src/tests/dlt-test-stress.c
index 4044edf..9698b7b 100644
--- a/src/tests/dlt-test-stress.c
+++ b/src/tests/dlt-test-stress.c
@@ -288,7 +288,7 @@ void stress2(void)
printf("Starting stress test2... \n");
- srand(time(NULL));
+ srand((unsigned int) time(NULL));
printf("* Creating %d Threads, each of them registers one context,\n", STRESS2_MAX_NUM_THREADS);
printf(" sending one log message, then unregisters the context\n");
@@ -350,8 +350,8 @@ void stress3(void)
printf("* Logging raw data, up to a size of %d\n", STRESS3_MAX_NUM_MESSAGES);
for (num = 0; num < STRESS3_MAX_NUM_MESSAGES; num++) {
- buffer[num] = num;
- DLT_LOG(context_stress3, DLT_LOG_INFO, DLT_INT(num), DLT_RAW(buffer, num));
+ buffer[num] = (char) num;
+ DLT_LOG(context_stress3, DLT_LOG_INFO, DLT_INT(num), DLT_RAW(buffer,(uint16_t) num));
ts.tv_sec = 0;
ts.tv_nsec = 10000 * 1000;
nanosleep(&ts, NULL);
diff --git a/src/tests/dlt-test-user.c b/src/tests/dlt-test-user.c
index bde6f0f..9ff6459 100644
--- a/src/tests/dlt-test-user.c
+++ b/src/tests/dlt-test-user.c
@@ -394,7 +394,7 @@ int test2m(void)
DLT_LOG(context_macro_test[1], DLT_LOG_INFO, DLT_STRING("float64"), DLT_FLOAT64(DBL_MIN), DLT_FLOAT64(DBL_MAX));
for (num2 = 0; num2 < 10; num2++)
- buffer[num2] = num2;
+ buffer[num2] = (char) num2;
DLT_LOG(context_macro_test[1], DLT_LOG_INFO, DLT_STRING("raw"), DLT_RAW(buffer, 10));
@@ -443,7 +443,7 @@ int test3m(void)
DLT_FLOAT64(DBL_MAX));
for (num2 = 0; num2 < 10; num2++)
- buffer[num2] = num2;
+ buffer[num2] = (char) num2;
DLT_LOG_ID(context_macro_test[2], DLT_LOG_INFO, 14, DLT_STRING("raw"), DLT_RAW(buffer, 10));
@@ -462,7 +462,7 @@ int test4m(void)
int num;
for (num = 0; num < 1024; num++)
- buffer[num] = num;
+ buffer[num] = (char) num;
/* Test 4: (Macro IF) Message size test */
printf("Test4m: (Macro IF) Test different message sizes\n");
@@ -489,7 +489,7 @@ int test5m(void)
void *ptr = malloc(sizeof(int));
for (num = 0; num < 32; num++)
- buffer[num] = num;
+ buffer[num] = (char) num;
/* Test 5: (Macro IF) Test high-level API */
printf("Test5m: (Macro IF) Test high-level API\n");
@@ -565,7 +565,7 @@ int test7m(void)
int num;
for (num = 0; num < 32; num++)
- buffer[num] = num;
+ buffer[num] = (char) num;
/* Show all log messages and traces */
DLT_SET_APPLICATION_LL_TS_LIMIT(DLT_LOG_VERBOSE, DLT_TRACE_STATUS_ON);
@@ -602,7 +602,7 @@ int test8m(void)
int num;
for (num = 0; num < 1024 * 5; num++)
- buffer[num] = num;
+ buffer[num] = (char) num;
/* Show all log messages and traces */
DLT_SET_APPLICATION_LL_TS_LIMIT(DLT_LOG_VERBOSE, DLT_TRACE_STATUS_ON);
@@ -639,7 +639,7 @@ int test9m(void)
int num;
for (num = 0; num < 1024 * 5; num++)
- buffer[num] = num;
+ buffer[num] = (char) num;
/* Show all log messages and traces */
DLT_SET_APPLICATION_LL_TS_LIMIT(DLT_LOG_VERBOSE, DLT_TRACE_STATUS_ON);
@@ -842,7 +842,7 @@ int test2f(void)
}
for (num2 = 0; num2 < 10; num2++)
- buffer[num2] = num2;
+ buffer[num2] = (char) num2;
if (dlt_user_log_write_start(&(context_function_test[1]), &context_data, DLT_LOG_INFO) > 0) {
dlt_user_log_write_string(&context_data, "raw");
@@ -957,7 +957,7 @@ int test3f(void)
}
for (num2 = 0; num2 < 10; num2++)
- buffer[num2] = num2;
+ buffer[num2] = (char) num2;
if (dlt_user_log_write_start_id(&(context_function_test[2]), &context_data, DLT_LOG_INFO, 14) > 0) {
dlt_user_log_write_string(&context_data, "raw");
@@ -984,7 +984,7 @@ int test4f(void)
int num;
for (num = 0; num < 1024; num++)
- buffer[num] = num;
+ buffer[num] = (char) num;
/* Test 4: (Function IF) Message size test */
printf("Test4f: (Function IF) Test different message sizes\n");
@@ -1037,7 +1037,7 @@ int test5f(void)
char log[DLT_USER_BUF_MAX_SIZE];
for (num = 0; num < 32; num++)
- buffer[num] = num;
+ buffer[num] = (char) num;
/* Test 5: (Function IF) Test high-level API */
printf("Test5f: (Function IF) Test high-level API\n");
@@ -1123,7 +1123,7 @@ int test7f(void)
int num;
for (num = 0; num < 32; num++)
- buffer[num] = num;
+ buffer[num] = (char) num;
/* Show all log messages and traces */
dlt_set_application_ll_ts_limit(DLT_LOG_VERBOSE, DLT_TRACE_STATUS_ON);
@@ -1172,7 +1172,7 @@ int test8f(void)
int num;
for (num = 0; num < 1024 * 5; num++)
- buffer[num] = num;
+ buffer[num] = (char) num;
/* Show all log messages and traces */
dlt_set_application_ll_ts_limit(DLT_LOG_VERBOSE, DLT_TRACE_STATUS_ON);
@@ -1222,7 +1222,7 @@ int test9f(void)
int num;
for (num = 0; num < 1024 * 5; num++)
- buffer[num] = num;
+ buffer[num] = (char) num;
/* Show all log messages and traces */
dlt_set_application_ll_ts_limit(DLT_LOG_VERBOSE, DLT_TRACE_STATUS_ON);
@@ -1318,7 +1318,7 @@ int test_injection_macro_callback(uint32_t service_id, void *data, uint32_t leng
memset(text, 0, 1024);
if (length > 0) {
- dlt_print_mixed_string(text, 1024, data, length, 0);
+ dlt_print_mixed_string(text, 1024, data, (int) length, 0);
printf("%s \n", text);
}
@@ -1338,7 +1338,7 @@ int test_injection_function_callback(uint32_t service_id, void *data, uint32_t l
memset(text, 0, 1024);
if (length > 0) {
- dlt_print_mixed_string(text, 1024, data, length, 0);
+ dlt_print_mixed_string(text, 1024, data, (int) length, 0);
printf("%s \n", text);
}
View Lorry Controller Status