sven/can-utils
1
0
Fork 0
mirror of https://github.com/linux-can/can-utils.git synced 2026-09-21 15:29:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

j1939: Fix comparison type mismatch warnings

Browse Source 
Fix missing (recently introduced) j1939 files that have not been fixed
in commit 46895a41c5 ("Fix comparison type mismatch warnings") from
Gary Bisson.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
This commit is contained in:
Oliver Hartkopp
2020-06-12 20:08:18 +02:00
parent 85ae5aaecf
commit 75d9c7e95f
4 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testj1939.c
+8 -6
View File
@@ -72,7 +72,8 @@ static void schedule_oneshot_itimer(double delay)
/* main */
int main(int argc, char *argv[])
{
int ret, sock, opt, j;
int ret, sock, opt;
unsigned int j;
int verbose = 0;
socklen_t peernamelen;
struct sockaddr_can sockname = {
@@ -92,7 +93,8 @@ int main(int argc, char *argv[])
};
uint8_t dat[128];
int valid_peername = 0;
int todo_send = 0, todo_recv = 0, todo_echo = 0, todo_prio = -1;
unsigned int todo_send = 0;
int todo_recv = 0, todo_echo = 0, todo_prio = -1;
int todo_connect = 0, todo_names = 0, todo_wait = 0, todo_rebind = 0;
int todo_broadcast = 0, todo_promisc = 0;
int no_bind = 0;
@@ -289,16 +291,16 @@ int main(int argc, char *argv[])
err(1, "sendto");
}
if (todo_recv) {
int i = 0;
int i;
if (todo_names && peername.can_addr.j1939.name)
printf("%016llx ", peername.can_addr.j1939.name);
printf("%02x %05x:", peername.can_addr.j1939.addr,
peername.can_addr.j1939.pgn);
for (j = 0; j < ret; ++j, i++) {
if (i == 8) {
for (i = 0, j = 0; i < ret; ++i, j++) {
if (j == 8) {
printf("\n%05x ", j);
i = 0;
j = 0;
}
printf(" %02x", dat[j]);
}