sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #542 from marckleinebudde/fix-compiler-errors 

Fix compiler errors
pull/543/head
Marc Kleine-Budde 2024-05-29 14:37:21 +02:00 committed by GitHub
parent c468568f1e 1405a90e8b
commit bfcf548f97
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
isobusfs/isobusfs_cmn.c
View File

@ -258,9 +258,9 @@ static void isobusfs_print_timestamp(struct isobusfs_err_msg *emsg,
if (!(cur->tv_sec | cur->tv_nsec)) if (!(cur->tv_sec | cur->tv_nsec))
return; return;
fprintf(stderr, " %s: %lu s %lu us (seq=%u/%u, send=%u)", fprintf(stderr, " %s: %llu s %llu us (seq=%u/%u, send=%u)",
name, cur->tv_sec, cur->tv_nsec / 1000, name, (unsigned long long)cur->tv_sec, (unsigned long long)cur->tv_nsec / 1000,
stats->tskey_sch, stats->tskey_ack, stats->send); stats->tskey_sch, stats->tskey_ack, stats->send);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }

12
j1939spy.c
View File

@ -99,7 +99,7 @@ int main(int argc, char **argv)
int filter = 0; int filter = 0;
uint8_t priority, dst_addr; uint8_t priority, dst_addr;
uint64_t dst_name; uint64_t dst_name;
long recvflags; uint64_t recvflags;
/* argument parsing */ /* argument parsing */
while ((opt = getopt_long(argc, argv, optstring, long_opts, NULL)) != -1) while ((opt = getopt_long(argc, argv, optstring, long_opts, NULL)) != -1)
@ -230,11 +230,11 @@ int main(int argc, char **argv)
case SOL_SOCKET: case SOL_SOCKET:
if (cmsg->cmsg_type == SCM_TIMESTAMP) { if (cmsg->cmsg_type == SCM_TIMESTAMP) {
memcpy(&tdut, CMSG_DATA(cmsg), sizeof(tdut)); memcpy(&tdut, CMSG_DATA(cmsg), sizeof(tdut));
recvflags |= 1 << cmsg->cmsg_type; recvflags |= 1ULL << cmsg->cmsg_type;
} }
break; break;
case SOL_CAN_J1939: case SOL_CAN_J1939:
recvflags |= 1 << cmsg->cmsg_type; recvflags |= 1ULL << cmsg->cmsg_type;
if (cmsg->cmsg_type == SCM_J1939_DEST_ADDR) if (cmsg->cmsg_type == SCM_J1939_DEST_ADDR)
dst_addr = *CMSG_DATA(cmsg); dst_addr = *CMSG_DATA(cmsg);
else if (cmsg->cmsg_type == SCM_J1939_DEST_NAME) else if (cmsg->cmsg_type == SCM_J1939_DEST_NAME)
@ -245,7 +245,7 @@ int main(int argc, char **argv)
} }
} }
if (recvflags & (1 << SCM_TIMESTAMP)) { if (recvflags & (1ULL << SCM_TIMESTAMP)) {
if ('z' == s.time) { if ('z' == s.time) {
if (!tref.tv_sec) if (!tref.tv_sec)
tref = tdut; tref = tdut;
@ -270,9 +270,9 @@ abs_time:
} }
} }
printf(" %s ", libj1939_addr2str(&src)); printf(" %s ", libj1939_addr2str(&src));
if (recvflags & (1 << SCM_J1939_DEST_NAME)) if (recvflags & (1ULL << SCM_J1939_DEST_NAME))
printf("%016llx ", (unsigned long long)dst_name); printf("%016llx ", (unsigned long long)dst_name);
else if (recvflags & (1 << SCM_J1939_DEST_ADDR)) else if (recvflags & (1ULL << SCM_J1939_DEST_ADDR))
printf("%02x ", dst_addr); printf("%02x ", dst_addr);
else else
printf("- "); printf("- ");