From 3e85fc5422536484b11742a7d82259fef90cb0fd Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 12 Oct 2020 00:35:59 -0700
Subject: [PATCH] clang-tidy: fix cmp function usage

Found with bugprone-suspicious-string-compare

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 can-calc-bit-timing.c | 3 ++-
 candump.c             | 2 +-
 canlogserver.c        | 5 ++---
 canplayer.c           | 2 +-
 cansniffer.c          | 2 +-
 j1939cat.c            | 4 ++--
 testj1939.c           | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/can-calc-bit-timing.c b/can-calc-bit-timing.c
index 9129844..fff00f4 100644
--- a/can-calc-bit-timing.c
+++ b/can-calc-bit-timing.c
@@ -691,7 +691,8 @@ int main(int argc, char *argv[])
 	}
 
 	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;
 
 		found = true;
diff --git a/candump.c b/candump.c
index 09d4770..b78f4fd 100644
--- a/candump.c
+++ b/candump.c
@@ -417,7 +417,7 @@ int main(int argc, char **argv)
 		printf("using interface name '%s'.\n", ifr.ifr_name);
 #endif
 
-		if (strcmp(ANYDEV, ifr.ifr_name)) {
+		if (strcmp(ANYDEV, ifr.ifr_name) != 0) {
 			if (ioctl(s[i], SIOCGIFINDEX, &ifr) < 0) {
 				perror("SIOCGIFINDEX");
 				exit(1);
diff --git a/canlogserver.c b/canlogserver.c
index 8b61ac4..d67fa0f 100644
--- a/canlogserver.c
+++ b/canlogserver.c
@@ -356,15 +356,14 @@ int main(int argc, char **argv)
 
 		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]);
 			if (ioctl(s[i], SIOCGIFINDEX, &ifr) < 0) {
 				perror("SIOCGIFINDEX");
 				exit(1);
 			}
 			addr.can_ifindex = ifr.ifr_ifindex;
-		}
-		else
+		} else
 			addr.can_ifindex = 0; /* any can interface */
 
 		if (bind(s[i], (struct sockaddr *)&addr, sizeof(addr)) < 0) {
diff --git a/canplayer.c b/canplayer.c
index 9f2f438..b4b02af 100644
--- a/canplayer.c
+++ b/canplayer.c
@@ -215,7 +215,7 @@ int add_assignment(char *mode, int socket, char *txname, char *rxname,
 	}
 	strcpy(asgn[i].rxif, rxname);
 
-	if (strcmp(txname, "stdout")) {
+	if (strcmp(txname, "stdout") != 0) {
 		strcpy(ifr.ifr_name, txname);
 		if (ioctl(socket, SIOCGIFINDEX, &ifr) < 0) {
 			perror("SIOCGIFINDEX");
diff --git a/cansniffer.c b/cansniffer.c
index 90d8d75..caa8796 100644
--- a/cansniffer.c
+++ b/cansniffer.c
@@ -333,7 +333,7 @@ int main(int argc, char **argv)
 
 	addr.can_family = AF_CAN;
 
-	if (strcmp(ANYDEV, argv[optind]))
+	if (strcmp(ANYDEV, argv[optind]) != 0)
 		addr.can_ifindex = if_nametoindex(argv[optind]);
 	else
 		addr.can_ifindex = 0; /* any can interface */
diff --git a/j1939cat.c b/j1939cat.c
index a672aa2..160e329 100644
--- a/j1939cat.c
+++ b/j1939cat.c
@@ -641,13 +641,13 @@ static int j1939cat_parse_args(struct j1939cat_priv *priv, int argc, char *argv[
 		}
 
 	if (argv[optind]) {
-		if (strcmp("-", argv[optind]))
+		if (strcmp("-", argv[optind]) != 0)
 			libj1939_parse_canaddr(argv[optind], &priv->sockname);
 		optind++;
 	}
 
 	if (argv[optind]) {
-		if (strcmp("-", argv[optind])) {
+		if (strcmp("-", argv[optind]) != 0) {
 			libj1939_parse_canaddr(argv[optind], &priv->peername);
 			priv->valid_peername = 1;
 		}
diff --git a/testj1939.c b/testj1939.c
index 09b4454..c7af013 100644
--- a/testj1939.c
+++ b/testj1939.c
@@ -150,7 +150,7 @@ int main(int argc, char *argv[])
 		}
 
 	if (argv[optind]) {
-		if (strcmp("-", argv[optind]))
+		if (strcmp("-", argv[optind]) != 0)
 			libj1939_parse_canaddr(argv[optind], &sockname);
 		++optind;
 	}
@@ -159,7 +159,7 @@ int main(int argc, char *argv[])
 		sockname.can_addr.j1939.addr++;
 
 	if (argv[optind]) {
-		if (strcmp("-", argv[optind])) {
+		if (strcmp("-", argv[optind]) != 0) {
 			libj1939_parse_canaddr(argv[optind], &peername);
 			valid_peername = 1;
 		}