Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
turistu committed Apr 19, 2024
2 parents 3a6d946 + c73580f commit 49a99b7
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions tests/mq_sendrecv.c
Original file line number Diff line number Diff line change
Expand Up @@ -195,11 +195,11 @@ main(void)
static const kernel_ulong_t bogus_prio =
(kernel_ulong_t) 0xdec0ded1defaced3ULL;
static const kernel_old_timespec_t bogus_tmout_data = {
.tv_sec = (time_t) 0xdeadfacebeeff00dLL,
.tv_sec = (typeof(bogus_tmout_data.tv_sec)) 0xdeadfacebeeff00dLL,
.tv_nsec = (long) 0xfacefee1deadfeedLL,
};
static const kernel_old_timespec_t future_tmout_data = {
.tv_sec = (time_t) 0x7ea1fade7e57faceLL,
.tv_sec = (typeof(future_tmout_data.tv_sec)) 0x7ea1fade7e57faceLL,
.tv_nsec = 999999999,
};
struct_sigevent bogus_sev_data = {
Expand Down
2 changes: 1 addition & 1 deletion tests/recvmmsg-timeout.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ main(void)
fds[0], &mh, (long long) ts->tv_sec,
zero_extend_signed_to_ull(ts->tv_nsec), sprintrc(rc));

ts->tv_sec = (time_t) 0xcafef00ddeadbeefLL;
ts->tv_sec = (typeof(ts->tv_sec)) 0xcafef00ddeadbeefLL;
ts->tv_nsec = (long) 0xbadc0dedfacefeedLL;

rc = recv_mmsg(fds[0], &mh, 1, 0, ts);
Expand Down
2 changes: 1 addition & 1 deletion tests/xselect.c
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ main(void)
* Very odd timeout.
*/
*l_rs = (1UL << fds[0]) | (1UL << fds[1]);
tv_in.tv_sec = (time_t) 0xcafef00ddeadbeefLL;
tv_in.tv_sec = (typeof(tv_in.tv_sec)) 0xcafef00ddeadbeefLL;
tv_in.tv_usec = (suseconds_t) 0xbadc0dedfacefeedLL;
memcpy(tv, &tv_in, sizeof(tv_in));
rc = xselect(nfds, a_rs, a_rs, a_rs, a_tv);
Expand Down
2 changes: 1 addition & 1 deletion tests/xutimes.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ main(void)

tv[0].tv_sec = 0xdeadbeefU;
tv[0].tv_usec = 0xfacefeedU;
tv[1].tv_sec = (time_t) 0xcafef00ddeadbeefLL;
tv[1].tv_sec = (typeof(tv[1].tv_sec)) 0xcafef00ddeadbeefLL;
tv[1].tv_usec = (suseconds_t) 0xbadc0dedfacefeedLL;

k_utimes(kfname, (uintptr_t) tv);
Expand Down

0 comments on commit 49a99b7

Please sign in to comment.