Skip to content

Fix 32-bit time_t compile errors in DLTv2 timestamp code #856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xl4hub wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix 32-bit time_t compile errors in DLTv2 timestamp code #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/daemon/dlt-daemon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2715,7 +2715,7 @@ int dlt_daemon_log_internal(DltDaemon *daemon, DltDaemonLocal *daemon_local,
#else
struct timespec ts;
if(clock_gettime(CLOCK_REALTIME, &ts) == 0) {
msg.headerextrav2.seconds[0]=(uint8_t)((ts.tv_sec >> 32) & 0xFF);
msg.headerextrav2.seconds[0]=(uint8_t)(((uint64_t)ts.tv_sec >> 32) & 0xFF);
msg.headerextrav2.seconds[1]=(uint8_t)((ts.tv_sec >> 24) & 0xFF);
msg.headerextrav2.seconds[2]=(uint8_t)((ts.tv_sec >> 16) & 0xFF);
msg.headerextrav2.seconds[3]=(uint8_t)((ts.tv_sec >> 8) & 0xFF);
Expand All @@ -2724,7 +2724,7 @@ int dlt_daemon_log_internal(DltDaemon *daemon, DltDaemonLocal *daemon_local,
msg.headerextrav2.nanoseconds = (uint32_t) ts.tv_nsec; /* value is long */
}
}else if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) {
msg.headerextrav2.seconds[0]=(uint8_t)((ts.tv_sec >> 32) & 0xFF);
msg.headerextrav2.seconds[0]=(uint8_t)(((uint64_t)ts.tv_sec >> 32) & 0xFF);
msg.headerextrav2.seconds[1]=(uint8_t)((ts.tv_sec >> 24) & 0xFF);
msg.headerextrav2.seconds[2]=(uint8_t)((ts.tv_sec >> 16) & 0xFF);
msg.headerextrav2.seconds[3]=(uint8_t)((ts.tv_sec >> 8) & 0xFF);
Expand Down
4 changes: 2 additions & 2 deletions src/daemon/dlt_daemon_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ int dlt_daemon_client_send_control_message_v2(int sock,
#else
struct timespec ts;
if (clock_gettime(CLOCK_REALTIME, &ts) == 0) {
msg->headerextrav2.seconds[0]=(uint8_t)((ts.tv_sec >> 32) & 0xFF);
msg->headerextrav2.seconds[0]=(uint8_t)(((uint64_t)ts.tv_sec >> 32) & 0xFF);
msg->headerextrav2.seconds[1]=(uint8_t)((ts.tv_sec >> 24) & 0xFF);
msg->headerextrav2.seconds[2]=(uint8_t)((ts.tv_sec >> 16) & 0xFF);
msg->headerextrav2.seconds[3]=(uint8_t)((ts.tv_sec >> 8) & 0xFF);
Expand All @@ -885,7 +885,7 @@ int dlt_daemon_client_send_control_message_v2(int sock,
msg->headerextrav2.nanoseconds = (uint32_t) ts.tv_nsec; /* value is long */
}
} else if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) {
msg->headerextrav2.seconds[0]=(uint8_t)((ts.tv_sec >> 32) & 0xFF);
msg->headerextrav2.seconds[0]=(uint8_t)(((uint64_t)ts.tv_sec >> 32) & 0xFF);
msg->headerextrav2.seconds[1]=(uint8_t)((ts.tv_sec >> 24) & 0xFF);
msg->headerextrav2.seconds[2]=(uint8_t)((ts.tv_sec >> 16) & 0xFF);
msg->headerextrav2.seconds[3]=(uint8_t)((ts.tv_sec >> 8) & 0xFF);
Expand Down
4 changes: 2 additions & 2 deletions src/lib/dlt_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@ DltReturnValue dlt_client_send_ctrl_msg_v2(DltClient *client, char *apid, char *
#else
struct timespec ts;
if(clock_gettime(CLOCK_REALTIME, &ts) == 0) {
msg.headerextrav2.seconds[0]=(ts.tv_sec >> 32) & 0xFF;
msg.headerextrav2.seconds[0]=((uint64_t)ts.tv_sec >> 32) & 0xFF;
msg.headerextrav2.seconds[1]=(ts.tv_sec >> 24) & 0xFF;
msg.headerextrav2.seconds[2]=(ts.tv_sec >> 16) & 0xFF;
msg.headerextrav2.seconds[3]=(ts.tv_sec >> 8) & 0xFF;
Expand All @@ -1039,7 +1039,7 @@ DltReturnValue dlt_client_send_ctrl_msg_v2(DltClient *client, char *apid, char *
msg.headerextrav2.nanoseconds = (uint32_t) ts.tv_nsec; /* value is long */
}
}else if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) {
msg.headerextrav2.seconds[0]=(ts.tv_sec >> 32) & 0xFF;
msg.headerextrav2.seconds[0]=((uint64_t)ts.tv_sec >> 32) & 0xFF;
msg.headerextrav2.seconds[1]=(ts.tv_sec >> 24) & 0xFF;
msg.headerextrav2.seconds[2]=(ts.tv_sec >> 16) & 0xFF;
msg.headerextrav2.seconds[3]=(ts.tv_sec >> 8) & 0xFF;
Expand Down
6 changes: 3 additions & 3 deletions src/lib/dlt_user.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5465,7 +5465,7 @@ DltReturnValue dlt_user_log_send_log_v2(DltContextData *log, const int mtype, Dl
#else
struct timespec ts;
if(clock_gettime(CLOCK_REALTIME, &ts) == 0) {
msg.headerextrav2.seconds[0]=(uint8_t)((ts.tv_sec >> 32) & 0xFF);
msg.headerextrav2.seconds[0]=(uint8_t)(((uint64_t)ts.tv_sec >> 32) & 0xFF);
msg.headerextrav2.seconds[1]=(uint8_t)((ts.tv_sec >> 24) & 0xFF);
msg.headerextrav2.seconds[2]=(uint8_t)((ts.tv_sec >> 16) & 0xFF);
msg.headerextrav2.seconds[3]=(uint8_t)((ts.tv_sec >> 8) & 0xFF);
Expand All @@ -5474,7 +5474,7 @@ DltReturnValue dlt_user_log_send_log_v2(DltContextData *log, const int mtype, Dl
msg.headerextrav2.nanoseconds = (uint32_t) ts.tv_nsec; /* value is long */
}
}else if (clock_gettime(CLOCK_MONOTONIC, &ts) == 0) {
msg.headerextrav2.seconds[0]=(uint8_t)((ts.tv_sec >> 32) & 0xFF);
msg.headerextrav2.seconds[0]=(uint8_t)(((uint64_t)ts.tv_sec >> 32) & 0xFF);
msg.headerextrav2.seconds[1]=(uint8_t)((ts.tv_sec >> 24) & 0xFF);
msg.headerextrav2.seconds[2]=(uint8_t)((ts.tv_sec >> 16) & 0xFF);
msg.headerextrav2.seconds[3]=(uint8_t)((ts.tv_sec >> 8) & 0xFF);
Expand Down Expand Up @@ -5617,7 +5617,7 @@ DltReturnValue dlt_user_log_send_log_v2(DltContextData *log, const int mtype, Dl
/* Check filesize */
/* Return error if the file size has reached to maximum */
unsigned int msg_size = 0;
if (st.st_size < 0 || st.st_size > UINT_MAX) {
if (st.st_size < 0 || (uintmax_t)st.st_size > UINT_MAX) {
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);
return DLT_RETURN_FILESZERR;
}
Expand Down
4 changes: 2 additions & 2 deletions src/shared/dlt_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,7 @@ DltReturnValue dlt_message_header_flags(DltMessage *msg, char *text, size_t text

if ((flags & DLT_HEADER_SHOW_TIME) == DLT_HEADER_SHOW_TIME) {
/* print received time */
time_t tt = msg->storageheader->seconds;
time_t tt = (time_t)msg->storageheader->seconds;
tzset();
localtime_r(&tt, &timeinfo);
strftime (buffer, sizeof(buffer), "%Y/%m/%d %H:%M:%S", &timeinfo);
Expand Down Expand Up @@ -3649,7 +3649,7 @@ DltReturnValue dlt_set_storageheader_v2(DltStorageHeaderV2 *storageheader, uint8
#if defined(_MSC_VER)
storageheader->nanoseconds = 0;
#else
storageheader->seconds[0]=(uint8_t)((ts.tv_sec >> 32) & 0xFF);
storageheader->seconds[0]=(uint8_t)(((uint64_t)ts.tv_sec >> 32) & 0xFF);
storageheader->seconds[1]=(uint8_t)((ts.tv_sec >> 24) & 0xFF);
storageheader->seconds[2]=(uint8_t)((ts.tv_sec >> 16) & 0xFF);
storageheader->seconds[3]=(uint8_t)((ts.tv_sec >> 8) & 0xFF);
Expand Down
Loading