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

clang-tidy: fix cmp function usage 

Found with bugprone-suspicious-string-compare

Signed-off-by: Rosen Penev <rosenp@gmail.com>
pull/250/head
Rosen Penev 2020-10-12 00:35:59 -07:00
parent 33f3593436
commit 3e85fc5422
No known key found for this signature in database
GPG Key ID: 36D31CFA845F0E3B
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
can-calc-bit-timing.c
View File

@ -691,7 +691,8 @@ int main(int argc, char *argv[])
} }
for (i = 0; i < ARRAY_SIZE(can_calc_consts); i++) { for (i = 0; i < ARRAY_SIZE(can_calc_consts); i++) {
if (name && strcmp(can_calc_consts[i].bittiming_const.name, name)) if (name &&
strcmp(can_calc_consts[i].bittiming_const.name, name) != 0)
continue; continue;
found = true; found = true;

2
candump.c
View File

@ -417,7 +417,7 @@ int main(int argc, char **argv)
printf("using interface name '%s'.\n", ifr.ifr_name); printf("using interface name '%s'.\n", ifr.ifr_name);
#endif #endif
if (strcmp(ANYDEV, ifr.ifr_name)) { if (strcmp(ANYDEV, ifr.ifr_name) != 0) {
if (ioctl(s[i], SIOCGIFINDEX, &ifr) < 0) { if (ioctl(s[i], SIOCGIFINDEX, &ifr) < 0) {
perror("SIOCGIFINDEX"); perror("SIOCGIFINDEX");
exit(1); exit(1);

5
canlogserver.c
View File

@ -356,15 +356,14 @@ int main(int argc, char **argv)
addr.can_family = AF_CAN; addr.can_family = AF_CAN;
if (strcmp(ANYDEV, argv[optind+i])) { if (strcmp(ANYDEV, argv[optind + i]) != 0) {
strcpy(ifr.ifr_name, argv[optind+i]); strcpy(ifr.ifr_name, argv[optind+i]);
if (ioctl(s[i], SIOCGIFINDEX, &ifr) < 0) { if (ioctl(s[i], SIOCGIFINDEX, &ifr) < 0) {
perror("SIOCGIFINDEX"); perror("SIOCGIFINDEX");
exit(1); exit(1);
} }
addr.can_ifindex = ifr.ifr_ifindex; addr.can_ifindex = ifr.ifr_ifindex;
} } else
else
addr.can_ifindex = 0; /* any can interface */ addr.can_ifindex = 0; /* any can interface */
if (bind(s[i], (struct sockaddr *)&addr, sizeof(addr)) < 0) { if (bind(s[i], (struct sockaddr *)&addr, sizeof(addr)) < 0) {

2
canplayer.c
View File

@ -215,7 +215,7 @@ int add_assignment(char *mode, int socket, char *txname, char *rxname,
} }
strcpy(asgn[i].rxif, rxname); strcpy(asgn[i].rxif, rxname);
if (strcmp(txname, "stdout")) { if (strcmp(txname, "stdout") != 0) {
strcpy(ifr.ifr_name, txname); strcpy(ifr.ifr_name, txname);
if (ioctl(socket, SIOCGIFINDEX, &ifr) < 0) { if (ioctl(socket, SIOCGIFINDEX, &ifr) < 0) {
perror("SIOCGIFINDEX"); perror("SIOCGIFINDEX");

2
cansniffer.c
View File

@ -333,7 +333,7 @@ int main(int argc, char **argv)
addr.can_family = AF_CAN; addr.can_family = AF_CAN;
if (strcmp(ANYDEV, argv[optind])) if (strcmp(ANYDEV, argv[optind]) != 0)
addr.can_ifindex = if_nametoindex(argv[optind]); addr.can_ifindex = if_nametoindex(argv[optind]);
else else
addr.can_ifindex = 0; /* any can interface */ addr.can_ifindex = 0; /* any can interface */

4
j1939cat.c
View File

@ -641,13 +641,13 @@ static int j1939cat_parse_args(struct j1939cat_priv *priv, int argc, char *argv[
} }
if (argv[optind]) { if (argv[optind]) {
if (strcmp("-", argv[optind])) if (strcmp("-", argv[optind]) != 0)
libj1939_parse_canaddr(argv[optind], &priv->sockname); libj1939_parse_canaddr(argv[optind], &priv->sockname);
optind++; optind++;
} }
if (argv[optind]) { if (argv[optind]) {
if (strcmp("-", argv[optind])) { if (strcmp("-", argv[optind]) != 0) {
libj1939_parse_canaddr(argv[optind], &priv->peername); libj1939_parse_canaddr(argv[optind], &priv->peername);
priv->valid_peername = 1; priv->valid_peername = 1;
} }

4
testj1939.c
View File

@ -150,7 +150,7 @@ int main(int argc, char *argv[])
} }
if (argv[optind]) { if (argv[optind]) {
if (strcmp("-", argv[optind])) if (strcmp("-", argv[optind]) != 0)
libj1939_parse_canaddr(argv[optind], &sockname); libj1939_parse_canaddr(argv[optind], &sockname);
++optind; ++optind;
} }
@ -159,7 +159,7 @@ int main(int argc, char *argv[])
sockname.can_addr.j1939.addr++; sockname.can_addr.j1939.addr++;
if (argv[optind]) { if (argv[optind]) {
if (strcmp("-", argv[optind])) { if (strcmp("-", argv[optind]) != 0) {
libj1939_parse_canaddr(argv[optind], &peername); libj1939_parse_canaddr(argv[optind], &peername);
valid_peername = 1; valid_peername = 1;
} }