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

remove obsolete char pointer casts 

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
pull/351/head
Oliver Hartkopp 2022-03-14 18:21:45 +01:00
parent 84d3294132
commit dfb607c807
9 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cangw.c
View File

@ -774,7 +774,7 @@ int main(int argc, char **argv)
break; break;
case 'u': case 'u':
uid = strtoul(optarg, (char **)NULL, 16); uid = strtoul(optarg, NULL, 16);
break; break;
case 'l': case 'l':

4
cansniffer.c
View File

@ -931,7 +931,7 @@ int readsettings(char* name)
done = true; done = true;
continue; continue;
} }
unsigned long id = strtoul(&buf[1], (char **)NULL, 16); unsigned long id = strtoul(&buf[1], NULL, 16);
sniftab[idx].current.can_id = id; sniftab[idx].current.can_id = id;
@ -942,7 +942,7 @@ int readsettings(char* name)
for (j = max_dlen - 1; j >= 0 ; j--) { for (j = max_dlen - 1; j >= 0 ; j--) {
sniftab[idx].notch.data[j] = sniftab[idx].notch.data[j] =
(__u8) strtoul(&buf[2*j+12], (char **)NULL, 16) & 0xFF; (__u8) strtoul(&buf[2*j+12], NULL, 16) & 0xFF;
buf[2*j+12] = 0; /* cut off each time */ buf[2*j+12] = 0; /* cut off each time */
} }

8
isotpdump.c
View File

@ -225,13 +225,13 @@ int main(int argc, char **argv)
while ((opt = getopt(argc, argv, "s:d:ax:X:ct:u?")) != -1) { while ((opt = getopt(argc, argv, "s:d:ax:X:ct:u?")) != -1) {
switch (opt) { switch (opt) {
case 's': case 's':
src = strtoul(optarg, (char **)NULL, 16); src = strtoul(optarg, NULL, 16);
if (strlen(optarg) > 7) if (strlen(optarg) > 7)
src |= CAN_EFF_FLAG; src |= CAN_EFF_FLAG;
break; break;
case 'd': case 'd':
dst = strtoul(optarg, (char **)NULL, 16); dst = strtoul(optarg, NULL, 16);
if (strlen(optarg) > 7) if (strlen(optarg) > 7)
dst |= CAN_EFF_FLAG; dst |= CAN_EFF_FLAG;
break; break;
@ -249,7 +249,7 @@ int main(int argc, char **argv)
if (!strncmp(optarg, "any", 3)) if (!strncmp(optarg, "any", 3))
extany = 1; extany = 1;
else else
extaddr = strtoul(optarg, (char **)NULL, 16) & 0xFF; extaddr = strtoul(optarg, NULL, 16) & 0xFF;
break; break;
case 'X': case 'X':
@ -257,7 +257,7 @@ int main(int argc, char **argv)
if (!strncmp(optarg, "any", 3)) if (!strncmp(optarg, "any", 3))
rx_extany = 1; rx_extany = 1;
else else
rx_extaddr = strtoul(optarg, (char **)NULL, 16) & 0xFF; rx_extaddr = strtoul(optarg, NULL, 16) & 0xFF;
break; break;
case 't': case 't':

8
isotpperf.c
View File

@ -121,25 +121,25 @@ int main(int argc, char **argv)
while ((opt = getopt(argc, argv, "s:d:x:X:?")) != -1) { while ((opt = getopt(argc, argv, "s:d:x:X:?")) != -1) {
switch (opt) { switch (opt) {
case 's': case 's':
src = strtoul(optarg, (char **)NULL, 16); src = strtoul(optarg, NULL, 16);
if (strlen(optarg) > 7) if (strlen(optarg) > 7)
src |= CAN_EFF_FLAG; src |= CAN_EFF_FLAG;
break; break;
case 'd': case 'd':
dst = strtoul(optarg, (char **)NULL, 16); dst = strtoul(optarg, NULL, 16);
if (strlen(optarg) > 7) if (strlen(optarg) > 7)
dst |= CAN_EFF_FLAG; dst |= CAN_EFF_FLAG;
break; break;
case 'x': case 'x':
ext = 1; ext = 1;
extaddr = strtoul(optarg, (char **)NULL, 16) & 0xFF; extaddr = strtoul(optarg, NULL, 16) & 0xFF;
break; break;
case 'X': case 'X':
rx_ext = 1; rx_ext = 1;
rx_extaddr = strtoul(optarg, (char **)NULL, 16) & 0xFF; rx_extaddr = strtoul(optarg, NULL, 16) & 0xFF;
break; break;
case '?': case '?':

12
isotprecv.c
View File

@ -99,13 +99,13 @@ int main(int argc, char **argv)
while ((opt = getopt(argc, argv, "s:d:x:p:P:b:m:w:f:lL:?")) != -1) { while ((opt = getopt(argc, argv, "s:d:x:p:P:b:m:w:f:lL:?")) != -1) {
switch (opt) { switch (opt) {
case 's': case 's':
addr.can_addr.tp.tx_id = strtoul(optarg, (char **)NULL, 16); addr.can_addr.tp.tx_id = strtoul(optarg, NULL, 16);
if (strlen(optarg) > 7) if (strlen(optarg) > 7)
addr.can_addr.tp.tx_id |= CAN_EFF_FLAG; addr.can_addr.tp.tx_id |= CAN_EFF_FLAG;
break; break;
case 'd': case 'd':
addr.can_addr.tp.rx_id = strtoul(optarg, (char **)NULL, 16); addr.can_addr.tp.rx_id = strtoul(optarg, NULL, 16);
if (strlen(optarg) > 7) if (strlen(optarg) > 7)
addr.can_addr.tp.rx_id |= CAN_EFF_FLAG; addr.can_addr.tp.rx_id |= CAN_EFF_FLAG;
break; break;
@ -163,20 +163,20 @@ int main(int argc, char **argv)
break; break;
case 'b': case 'b':
fcopts.bs = strtoul(optarg, (char **)NULL, 16) & 0xFF; fcopts.bs = strtoul(optarg, NULL, 16) & 0xFF;
break; break;
case 'm': case 'm':
fcopts.stmin = strtoul(optarg, (char **)NULL, 16) & 0xFF; fcopts.stmin = strtoul(optarg, NULL, 16) & 0xFF;
break; break;
case 'w': case 'w':
fcopts.wftmax = strtoul(optarg, (char **)NULL, 16) & 0xFF; fcopts.wftmax = strtoul(optarg, NULL, 16) & 0xFF;
break; break;
case 'f': case 'f':
opts.flags |= CAN_ISOTP_FORCE_RXSTMIN; opts.flags |= CAN_ISOTP_FORCE_RXSTMIN;
force_rx_stmin = strtoul(optarg, (char **)NULL, 10); force_rx_stmin = strtoul(optarg, NULL, 10);
break; break;
case 'l': case 'l':

10
isotpsend.c
View File

@ -104,13 +104,13 @@ int main(int argc, char **argv)
while ((opt = getopt(argc, argv, "s:d:x:p:P:t:f:D:l:g:bSL:?")) != -1) { while ((opt = getopt(argc, argv, "s:d:x:p:P:t:f:D:l:g:bSL:?")) != -1) {
switch (opt) { switch (opt) {
case 's': case 's':
addr.can_addr.tp.tx_id = strtoul(optarg, (char **)NULL, 16); addr.can_addr.tp.tx_id = strtoul(optarg, NULL, 16);
if (strlen(optarg) > 7) if (strlen(optarg) > 7)
addr.can_addr.tp.tx_id |= CAN_EFF_FLAG; addr.can_addr.tp.tx_id |= CAN_EFF_FLAG;
break; break;
case 'd': case 'd':
addr.can_addr.tp.rx_id = strtoul(optarg, (char **)NULL, 16); addr.can_addr.tp.rx_id = strtoul(optarg, NULL, 16);
if (strlen(optarg) > 7) if (strlen(optarg) > 7)
addr.can_addr.tp.rx_id |= CAN_EFF_FLAG; addr.can_addr.tp.rx_id |= CAN_EFF_FLAG;
break; break;
@ -171,16 +171,16 @@ int main(int argc, char **argv)
if (!strncmp(optarg, ZERO_STRING, strlen(ZERO_STRING))) if (!strncmp(optarg, ZERO_STRING, strlen(ZERO_STRING)))
opts.frame_txtime = CAN_ISOTP_FRAME_TXTIME_ZERO; opts.frame_txtime = CAN_ISOTP_FRAME_TXTIME_ZERO;
else else
opts.frame_txtime = strtoul(optarg, (char **)NULL, 10); opts.frame_txtime = strtoul(optarg, NULL, 10);
break; break;
case 'f': case 'f':
opts.flags |= CAN_ISOTP_FORCE_TXSTMIN; opts.flags |= CAN_ISOTP_FORCE_TXSTMIN;
force_tx_stmin = strtoul(optarg, (char **)NULL, 10); force_tx_stmin = strtoul(optarg, NULL, 10);
break; break;
case 'D': case 'D':
datalen = strtoul(optarg, (char **)NULL, 10); datalen = strtoul(optarg, NULL, 10);
if (!datalen || datalen >= BUFSIZE) { if (!datalen || datalen >= BUFSIZE) {
print_usage(basename(argv[0])); print_usage(basename(argv[0]));
exit(0); exit(0);

14
isotpserver.c
View File

@ -166,17 +166,17 @@ int main(int argc, char **argv)
while ((opt = getopt(argc, argv, "l:s:d:x:p:P:b:m:w:t:L:v?")) != -1) { while ((opt = getopt(argc, argv, "l:s:d:x:p:P:b:m:w:t:L:v?")) != -1) {
switch (opt) { switch (opt) {
case 'l': case 'l':
local_port = strtoul(optarg, (char **)NULL, 10); local_port = strtoul(optarg, NULL, 10);
break; break;
case 's': case 's':
caddr.can_addr.tp.tx_id = strtoul(optarg, (char **)NULL, 16); caddr.can_addr.tp.tx_id = strtoul(optarg, NULL, 16);
if (strlen(optarg) > 7) if (strlen(optarg) > 7)
caddr.can_addr.tp.tx_id |= CAN_EFF_FLAG; caddr.can_addr.tp.tx_id |= CAN_EFF_FLAG;
break; break;
case 'd': case 'd':
caddr.can_addr.tp.rx_id = strtoul(optarg, (char **)NULL, 16); caddr.can_addr.tp.rx_id = strtoul(optarg, NULL, 16);
if (strlen(optarg) > 7) if (strlen(optarg) > 7)
caddr.can_addr.tp.rx_id |= CAN_EFF_FLAG; caddr.can_addr.tp.rx_id |= CAN_EFF_FLAG;
break; break;
@ -234,19 +234,19 @@ int main(int argc, char **argv)
break; break;
case 'b': case 'b':
fcopts.bs = strtoul(optarg, (char **)NULL, 16) & 0xFF; fcopts.bs = strtoul(optarg, NULL, 16) & 0xFF;
break; break;
case 'm': case 'm':
fcopts.stmin = strtoul(optarg, (char **)NULL, 16) & 0xFF; fcopts.stmin = strtoul(optarg, NULL, 16) & 0xFF;
break; break;
case 'w': case 'w':
fcopts.wftmax = strtoul(optarg, (char **)NULL, 16) & 0xFF; fcopts.wftmax = strtoul(optarg, NULL, 16) & 0xFF;
break; break;
case 't': case 't':
opts.frame_txtime = strtoul(optarg, (char **)NULL, 10); opts.frame_txtime = strtoul(optarg, NULL, 10);
break; break;
case 'L': case 'L':

8
isotpsniffer.c
View File

@ -200,25 +200,25 @@ int main(int argc, char **argv)
while ((opt = getopt(argc, argv, "s:d:x:X:h:ct:f:L:?")) != -1) { while ((opt = getopt(argc, argv, "s:d:x:X:h:ct:f:L:?")) != -1) {
switch (opt) { switch (opt) {
case 's': case 's':
src = strtoul(optarg, (char **)NULL, 16); src = strtoul(optarg, NULL, 16);
if (strlen(optarg) > 7) if (strlen(optarg) > 7)
src |= CAN_EFF_FLAG; src |= CAN_EFF_FLAG;
break; break;
case 'd': case 'd':
dst = strtoul(optarg, (char **)NULL, 16); dst = strtoul(optarg, NULL, 16);
if (strlen(optarg) > 7) if (strlen(optarg) > 7)
dst |= CAN_EFF_FLAG; dst |= CAN_EFF_FLAG;
break; break;
case 'x': case 'x':
opts.flags |= CAN_ISOTP_EXTEND_ADDR; opts.flags |= CAN_ISOTP_EXTEND_ADDR;
opts.ext_address = strtoul(optarg, (char **)NULL, 16) & 0xFF; opts.ext_address = strtoul(optarg, NULL, 16) & 0xFF;
break; break;
case 'X': case 'X':
opts.flags |= CAN_ISOTP_RX_EXT_ADDR; opts.flags |= CAN_ISOTP_RX_EXT_ADDR;
opts.rx_ext_address = strtoul(optarg, (char **)NULL, 16) & 0xFF; opts.rx_ext_address = strtoul(optarg, NULL, 16) & 0xFF;
break; break;
case 'f': case 'f':

12
isotptun.c
View File

@ -154,13 +154,13 @@ int main(int argc, char **argv)
while ((opt = getopt(argc, argv, "s:d:n:x:p:P:t:b:m:whL:vD?")) != -1) { while ((opt = getopt(argc, argv, "s:d:n:x:p:P:t:b:m:whL:vD?")) != -1) {
switch (opt) { switch (opt) {
case 's': case 's':
addr.can_addr.tp.tx_id = strtoul(optarg, (char **)NULL, 16); addr.can_addr.tp.tx_id = strtoul(optarg, NULL, 16);
if (strlen(optarg) > 7) if (strlen(optarg) > 7)
addr.can_addr.tp.tx_id |= CAN_EFF_FLAG; addr.can_addr.tp.tx_id |= CAN_EFF_FLAG;
break; break;
case 'd': case 'd':
addr.can_addr.tp.rx_id = strtoul(optarg, (char **)NULL, 16); addr.can_addr.tp.rx_id = strtoul(optarg, NULL, 16);
if (strlen(optarg) > 7) if (strlen(optarg) > 7)
addr.can_addr.tp.rx_id |= CAN_EFF_FLAG; addr.can_addr.tp.rx_id |= CAN_EFF_FLAG;
break; break;
@ -228,19 +228,19 @@ int main(int argc, char **argv)
break; break;
case 't': case 't':
opts.frame_txtime = strtoul(optarg, (char **)NULL, 10); opts.frame_txtime = strtoul(optarg, NULL, 10);
break; break;
case 'b': case 'b':
fcopts.bs = strtoul(optarg, (char **)NULL, 16) & 0xFF; fcopts.bs = strtoul(optarg, NULL, 16) & 0xFF;
break; break;
case 'm': case 'm':
fcopts.stmin = strtoul(optarg, (char **)NULL, 16) & 0xFF; fcopts.stmin = strtoul(optarg, NULL, 16) & 0xFF;
break; break;
case 'w': case 'w':
fcopts.wftmax = strtoul(optarg, (char **)NULL, 16) & 0xFF; fcopts.wftmax = strtoul(optarg, NULL, 16) & 0xFF;
break; break;
case 'h': case 'h':