Skip to content

Commit d9a2251

Browse files
sandy-lcqminminlittleshrimp
sandy-lcq
authored and
minminlittleshrimp
committed
Fix build failures
Fix the following similar build failures, some of the build failure reproduced with arm64/riscv64, some of the build reproduced with 32bit x86/arm. dlt_daemon_common.c:2785:26: error: conversion to 'int8_t' {aka 'signed char'} from 'char' may change the sign of the result [-Werror=sign-conversion] src/tests/dlt-test-multi-process-client-v2.c:302:49: error: format '%lld' expects argument of type 'long long int', but argument 2 has type 'time_t' {aka 'long int'} [-Werror=format=] 302 | printf(" Time running (seconds) : %lld\n", time(NULL) - stats.first_message_time); | ~~~^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | | long long int time_t {aka long int} | %ld src/lib/dlt_user.c:5109:60: error: format '%lld' expects argument of type 'long long int', but argument 4 has type '__off_t' {aka 'long int'} [-Werror=format=] 5109 | dlt_vlog(LOG_DEBUG, "%s: Current file size=[%lld]\n", __func__, | ~~~^ | | | long long int | %ld 5110 | st.st_size); | ~~~~~~~~~~ | | | __off_t {aka long int} Signed-off-by: Changqing Li <changqing.li@windriver.com>
1 parent 10679a5 commit d9a2251

9 files changed

Lines changed: 39 additions & 39 deletions

‎src/daemon/dlt-daemon.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ int option_file_parser(DltDaemonLocal *daemon_local)
457457

458458
if (n < 0 || (size_t)n > sizeof(daemon_local->flags.loggingFilename)) {
459459
dlt_vlog(LOG_WARNING, "%s: snprintf truncation/error(%ld) %s\n",
460-
__func__, n, daemon_local->flags.loggingFilename);
460+
__func__, (long int)n, daemon_local->flags.loggingFilename);
461461
}
462462
daemon_local->flags.enableLoggingFileLimit = false;
463463
daemon_local->flags.loggingFileSize = 250000;
@@ -2501,7 +2501,7 @@ void dlt_daemon_exit_trigger()
25012501
n = snprintf(tmp, DLT_PATH_MAX, "%s/dlt", dltFifoBaseDir);
25022502
if (n < 0 || (size_t)n > DLT_PATH_MAX) {
25032503
dlt_vlog(LOG_WARNING, "%s: snprintf truncation/error(%ld) %s\n",
2504-
__func__, n, tmp);
2504+
__func__, (long int)n, tmp);
25052505
}
25062506

25072507
(void)unlink(tmp);
@@ -2878,8 +2878,8 @@ int dlt_daemon_log_internal(DltDaemon *daemon, DltDaemonLocal *daemon_local,
28782878
dlt_daemon_client_send(DLT_DAEMON_SEND_TO_ALL, daemon,daemon_local,
28792879
msg.headerbuffer, sizeof(DltStorageHeader),
28802880
msg.headerbuffer + sizeof(DltStorageHeader),
2881-
(size_t)(msg.headersize - (int32_t)sizeof(DltStorageHeader)),
2882-
msg.databuffer, (size_t)msg.datasize, verbose);
2881+
(int)(msg.headersize - (int32_t)sizeof(DltStorageHeader)),
2882+
msg.databuffer, (int)msg.datasize, verbose);
28832883

28842884
free(msg.databuffer);
28852885
}else {

‎src/daemon/dlt_daemon_client.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -551,8 +551,8 @@ int dlt_daemon_client_send_message_to_all_client(DltDaemon *daemon,
551551
return dlt_daemon_client_send(DLT_DAEMON_SEND_TO_ALL, daemon, daemon_local,
552552
daemon_local->msg.headerbuffer, sizeof(DltStorageHeader),
553553
daemon_local->msg.headerbuffer + sizeof(DltStorageHeader),
554-
(size_t)(daemon_local->msg.headersize - (int32_t)sizeof(DltStorageHeader)),
555-
daemon_local->msg.databuffer, (size_t)daemon_local->msg.datasize, verbose);
554+
(int)(daemon_local->msg.headersize - (int32_t)sizeof(DltStorageHeader)),
555+
daemon_local->msg.databuffer, (int)daemon_local->msg.datasize, verbose);
556556

557557
}
558558

@@ -771,8 +771,8 @@ int dlt_daemon_client_send_control_message(int sock,
771771
if ((ret =
772772
dlt_daemon_client_send(sock, daemon, daemon_local, msg->headerbuffer, sizeof(DltStorageHeader),
773773
msg->headerbuffer + sizeof(DltStorageHeader),
774-
(size_t)(msg->headersize - (int32_t)sizeof(DltStorageHeader)),
775-
msg->databuffer, (size_t)msg->datasize, verbose))) {
774+
(int)(msg->headersize - (int32_t)sizeof(DltStorageHeader)),
775+
msg->databuffer, (int)msg->datasize, verbose))) {
776776
dlt_log(LOG_DEBUG, "dlt_daemon_control_send_control_message: DLT message send to all failed!.\n");
777777
return ret;
778778
}
@@ -1919,7 +1919,7 @@ void dlt_daemon_control_get_log_info(int sock,
19191919

19201920
/* Allocate buffer for response message */
19211921
resp.databuffer = (uint8_t *)malloc((size_t)resp.datasize);
1922-
resp.databuffersize = (size_t)resp.datasize;
1922+
resp.databuffersize = resp.datasize;
19231923

19241924
if (resp.databuffer == 0) {
19251925
dlt_daemon_control_service_response(sock,
@@ -2572,7 +2572,7 @@ int dlt_daemon_control_message_buffer_overflow(int sock,
25722572

25732573
if (msg.databuffer == 0) {
25742574
msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize);
2575-
msg.databuffersize = (size_t)msg.datasize;
2575+
msg.databuffersize = msg.datasize;
25762576
}
25772577

25782578
if (msg.databuffer == 0)
@@ -2633,7 +2633,7 @@ int dlt_daemon_control_message_buffer_overflow_v2(int sock,
26332633

26342634
if (msg.databuffer == 0) {
26352635
msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize);
2636-
msg.databuffersize = (size_t)msg.datasize;
2636+
msg.databuffersize = msg.datasize;
26372637
}
26382638

26392639
if (msg.databuffer == 0)
@@ -2686,7 +2686,7 @@ void dlt_daemon_control_service_response(int sock,
26862686

26872687
if (msg.databuffer == 0) {
26882688
msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize);
2689-
msg.databuffersize = (size_t)msg.datasize;
2689+
msg.databuffersize = msg.datasize;
26902690
}
26912691

26922692
if (msg.databuffer == 0)
@@ -2732,7 +2732,7 @@ void dlt_daemon_control_service_response_v2(int sock,
27322732

27332733
if (msg.databuffer == 0) {
27342734
msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize);
2735-
msg.databuffersize = (size_t)msg.datasize;
2735+
msg.databuffersize = msg.datasize;
27362736
}
27372737

27382738
if (msg.databuffer == 0)
@@ -2779,7 +2779,7 @@ int dlt_daemon_control_message_unregister_context(int sock,
27792779

27802780
if (msg.databuffer == 0) {
27812781
msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize);
2782-
msg.databuffersize = (size_t)msg.datasize;
2782+
msg.databuffersize = msg.datasize;
27832783
}
27842784

27852785
if (msg.databuffer == 0)
@@ -2842,7 +2842,7 @@ int dlt_daemon_control_message_unregister_context_v2(int sock,
28422842

28432843
if (msg.databuffer == 0) {
28442844
msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize);
2845-
msg.databuffersize = (size_t)msg.datasize;
2845+
msg.databuffersize = msg.datasize;
28462846
}
28472847

28482848
if (msg.databuffer == 0)
@@ -2909,7 +2909,7 @@ int dlt_daemon_control_message_connection_info(int sock,
29092909

29102910
if (msg.databuffer == 0) {
29112911
msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize);
2912-
msg.databuffersize = (size_t)msg.datasize;
2912+
msg.databuffersize = msg.datasize;
29132913
}
29142914

29152915
if (msg.databuffer == 0)
@@ -2962,7 +2962,7 @@ int dlt_daemon_control_message_connection_info_v2(int sock,
29622962

29632963
if (msg.databuffer == 0) {
29642964
msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize);
2965-
msg.databuffersize = (size_t)msg.datasize;
2965+
msg.databuffersize = msg.datasize;
29662966
}
29672967

29682968
if (msg.databuffer == 0)
@@ -3010,7 +3010,7 @@ int dlt_daemon_control_message_timezone(int sock, DltDaemon *daemon, DltDaemonLo
30103010

30113011
if (msg.databuffer == 0) {
30123012
msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize);
3013-
msg.databuffersize = (size_t)msg.datasize;
3013+
msg.databuffersize = msg.datasize;
30143014
}
30153015

30163016
if (msg.databuffer == 0)
@@ -3072,7 +3072,7 @@ int dlt_daemon_control_message_timezone_v2(int sock, DltDaemon *daemon, DltDaemo
30723072

30733073
if (msg.databuffer == 0) {
30743074
msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize);
3075-
msg.databuffersize = (size_t)msg.datasize;
3075+
msg.databuffersize = msg.datasize;
30763076
}
30773077

30783078
if (msg.databuffer == 0)
@@ -3127,7 +3127,7 @@ int dlt_daemon_control_message_marker(int sock, DltDaemon *daemon, DltDaemonLoca
31273127

31283128
if (msg.databuffer == 0) {
31293129
msg.databuffer = (uint8_t *)malloc((size_t)msg.datasize);
3130-
msg.databuffersize = (size_t)msg.datasize;
3130+
msg.databuffersize = msg.datasize;
31313131
}
31323132

31333133
if (msg.databuffer == 0)

‎src/daemon/dlt_daemon_common.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2782,7 +2782,7 @@ int dlt_daemon_user_send_log_state(DltDaemon *daemon, DltDaemonApplication *app,
27822782
if (dlt_user_set_userheader(&userheader, DLT_USER_MESSAGE_LOG_STATE) < DLT_RETURN_OK)
27832783
return -1;
27842784

2785-
logstate.log_state = daemon->connectionState;
2785+
logstate.log_state = (int8_t)daemon->connectionState;
27862786

27872787
/* log to FIFO */
27882788
ret = dlt_user_log_out2_with_timeout(app->user_handle,
@@ -2811,7 +2811,7 @@ int dlt_daemon_user_send_log_state_v2(DltDaemon *daemon, DltDaemonApplication *a
28112811
if (dlt_user_set_userheader_v2(&userheader, DLT_USER_MESSAGE_LOG_STATE) < DLT_RETURN_OK)
28122812
return -1;
28132813

2814-
logstate.log_state = daemon->connectionState;
2814+
logstate.log_state = (int8_t)daemon->connectionState;
28152815

28162816
/* log to FIFO */
28172817
ret = dlt_user_log_out2_with_timeout(app->user_handle,

‎src/lib/dlt_user.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5106,17 +5106,17 @@ DltReturnValue dlt_user_log_send_log(DltContextData *log, const int mtype, int *
51065106
return DLT_RETURN_ERROR;
51075107
}
51085108

5109-
dlt_vlog(LOG_DEBUG, "%s: Current file size=[%ld]\n", __func__,
5110-
st.st_size);
5109+
dlt_vlog(LOG_DEBUG, "%s: Current file size=[%lld]\n", __func__,
5110+
(long long int)st.st_size);
51115111
/* Check filesize */
51125112
/* Return error if the file size has reached to maximum */
51135113
unsigned int msg_size = (unsigned int)st.st_size + (unsigned int)msg.headersize +
51145114
(unsigned int)log->size;
51155115
if (msg_size > dlt_user.filesize_max) {
51165116
dlt_user_file_reach_max = true;
51175117
dlt_vlog(LOG_ERR,
5118-
"%s: File size (%ld bytes) reached to defined maximum size (%d bytes)\n",
5119-
__func__, st.st_size, dlt_user.filesize_max);
5118+
"%s: File size (%lld bytes) reached to defined maximum size (%d bytes)\n",
5119+
__func__, (long long int)st.st_size, dlt_user.filesize_max);
51205120
dlt_mutex_unlock();
51215121
return DLT_RETURN_FILESZERR;
51225122
}
@@ -5612,21 +5612,21 @@ DltReturnValue dlt_user_log_send_log_v2(DltContextData *log, const int mtype, Dl
56125612
return DLT_RETURN_ERROR;
56135613
}
56145614

5615-
dlt_vlog(LOG_DEBUG, "%s: Current file size=[%ld]\n", __func__,
5616-
st.st_size);
5615+
dlt_vlog(LOG_DEBUG, "%s: Current file size=[%lld]\n", __func__,
5616+
(long long int)st.st_size);
56175617
/* Check filesize */
56185618
/* Return error if the file size has reached to maximum */
56195619
unsigned int msg_size = 0;
56205620
if (st.st_size < 0 || st.st_size > UINT_MAX) {
5621-
dlt_vlog(LOG_ERR, "%s: File size (%ld bytes) is invalid or too large for unsigned int\n", __func__, st.st_size);
5621+
dlt_vlog(LOG_ERR, "%s: File size (%lld bytes) is invalid or too large for unsigned int\n", __func__, (long long int)st.st_size);
56225622
return DLT_RETURN_FILESZERR;
56235623
}
56245624
msg_size = (unsigned int)st.st_size + (unsigned int) msg.headersizev2 + (unsigned int) log->size;
56255625
if (msg_size > dlt_user.filesize_max) {
56265626
dlt_user_file_reach_max = true;
56275627
dlt_vlog(LOG_ERR,
5628-
"%s: File size (%ld bytes) reached to defined maximum size (%d bytes)\n",
5629-
__func__, st.st_size, dlt_user.filesize_max);
5628+
"%s: File size (%lld bytes) reached to defined maximum size (%d bytes)\n",
5629+
__func__, (long long int)st.st_size, dlt_user.filesize_max);
56305630
return DLT_RETURN_FILESZERR;
56315631
}
56325632
else {

‎src/shared/dlt_common.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1220,7 +1220,7 @@ DltReturnValue dlt_message_header_flags_v2(DltMessageV2 *msg, char *text, size_t
12201220
for (int i = 0; i<5; ++i){
12211221
tt = (tt << 8) | msg->headerextrav2.seconds[i];
12221222
}
1223-
snprintf(text + strlen(text), textlength - strlen(text), "%ld.%.9u ", tt, msg->headerextrav2.nanoseconds);
1223+
snprintf(text + strlen(text), textlength - strlen(text), "%lld.%.9u ", (long long int)tt, msg->headerextrav2.nanoseconds);
12241224
}
12251225
else
12261226
snprintf(text + strlen(text), textlength - strlen(text), "---------- ");

‎src/shared/dlt_multiple_files.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ ssize_t multiple_files_buffer_get_total_size(const MultipleFilesRingBuffer *file
257257
if (((unsigned int)res < sizeof(filename)) && (res > 0)) {
258258
errno = 0;
259259
if (0 == stat(filename, &status))
260-
size += status.st_size;
260+
size += (ssize_t)status.st_size;
261261
else
262262
fprintf(stderr, "file %s cannot be stat-ed, error=%s\n", filename, strerror(errno));
263263
}

‎src/tests/dlt-test-multi-process-client-v2.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,10 @@ void print_stats(s_statistics stats, s_parameters params)
299299
printf(" Messages received : %d\n", stats.messages_received);
300300
printf(" Broken messages received : %d\n", stats.broken_messages_received);
301301
printf(" Bytes received : %d\n", stats.bytes_received);
302-
printf(" Time running (seconds) : %ld\n", time(NULL) - stats.first_message_time);
303-
printf(" Throughput (msgs/sec)/(B/sec) : %ld/%ld\n",
304-
stats.messages_received / ((time(NULL) - stats.first_message_time) + 1),
305-
(stats.bytes_received) / ((time(NULL) - stats.first_message_time) + 1));
302+
printf(" Time running (seconds) : %lld\n", (long long int)(time(NULL) - stats.first_message_time));
303+
printf(" Throughput (msgs/sec)/(B/sec) : %lld/%lld\n",
304+
(long long int)(stats.messages_received / ((time(NULL) - stats.first_message_time) + 1)),
305+
(long long int)((stats.bytes_received) / ((time(NULL) - stats.first_message_time) + 1)));
306306

307307
if (params.messages_left == 0) {
308308
if (stats.broken_messages_received == 0)

‎src/tests/dlt-test-multi-process-v2.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ void *do_logging(void *arg)
393393

394394
sleep_time = mksleep_time(data->params.delay, data->params.delay_fudge);
395395
ts.tv_sec = sleep_time / 1000000000;
396-
ts.tv_nsec = sleep_time % 1000000000;
396+
ts.tv_nsec = (long int)(sleep_time % 1000000000);
397397
nanosleep(&ts, NULL);
398398
}
399399

‎src/tests/dlt-test-multi-process.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ void *do_logging(void *arg)
370370

371371
sleep_time = mksleep_time(data->params.delay, data->params.delay_fudge);
372372
ts.tv_sec = sleep_time / 1000000000;
373-
ts.tv_nsec = sleep_time % 1000000000;
373+
ts.tv_nsec = (long int)(sleep_time % 1000000000);
374374
nanosleep(&ts, NULL);
375375
}
376376

0 commit comments

Comments
 (0)