From daba307035faf4cc01f1ccb883b21281d91234cc Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 28 Jul 2017 14:10:07 +0200
Subject: treewide: Kill assignments in if conditions.

Somewhat hard to read and the code base already has many overlong
lines.

Found with below spatch file and some manual editing in ax25/access.c
to restore a comment lost by spatch.

@parens@
expression E, F, G;
binary operator X;
statement S;
@@
-	if ((E = F) X G)
+	E = F;
+	if (E X G)
		S

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---
 kiss/net2kiss.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'kiss/net2kiss.c')

diff --git a/kiss/net2kiss.c b/kiss/net2kiss.c
index 1c1b50d..d9e8ff5 100644
--- a/kiss/net2kiss.c
+++ b/kiss/net2kiss.c
@@ -258,7 +258,8 @@ static int openpty(int *amaster, int *aslave, char *name,
 #if 0
 				(void) revoke(line);
 #endif
-				if ((slave = open(line, O_RDWR, 0)) != -1) {
+				slave = open(line, O_RDWR, 0);
+				if (slave != -1) {
 					*amaster = master;
 					*aslave = slave;
 					if (name)
@@ -596,8 +597,8 @@ int main(int argc, char *argv[])
 		slavename[5] = 'p';
 		master_name = slavename;
 	} else {
-		if ((fdpty = open(name_pname,
-				  O_RDWR | O_NOCTTY | O_NONBLOCK)) < 0) {
+		fdpty = open(name_pname, O_RDWR | O_NOCTTY | O_NONBLOCK);
+		if (fdpty < 0) {
 			fprintf(stderr, "%s: cannot open \"%s\"\n", progname,
 				name_pname);
 			exit(1);
@@ -606,7 +607,8 @@ int main(int argc, char *argv[])
 			i_am_unix98_pty_master = 1;
 		master_name = name_pname;
 	}
-	if ((fdif = socket(PF_INET, SOCK_PACKET, proto)) < 0)
+	fdif = socket(PF_INET, SOCK_PACKET, proto);
+	if (fdif < 0)
 		die("socket");
 	memset(&sa, 0, sizeof(struct sockaddr));
 	memcpy(sa.sa_data, name_iface, sizeof(sa.sa_data));
@@ -622,7 +624,8 @@ int main(int argc, char *argv[])
 		die("ioctl SIOCSIFFLAGS");
 	if (i_am_unix98_pty_master) {
 		/* get name of pts-device */
-		if ((namepts = ptsname(fdpty)) == NULL) {
+		namepts = ptsname(fdpty);
+		if (namepts == NULL) {
 			fprintf(stderr, "%s: Cannot get name of pts-device.\n", progname);
 			exit (1);
 		}
@@ -673,7 +676,9 @@ int main(int argc, char *argv[])
 				printf("reopening master tty: %s\n", master_name);
 			close(fdpty);
 
-			if ((fdpty = open(master_name, O_RDWR | O_NOCTTY | O_NONBLOCK)) < 0) {
+			fdpty = open(master_name,
+				     O_RDWR | O_NOCTTY | O_NONBLOCK);
+			if (fdpty < 0) {
 				fprintf(stderr, "%s: cannot reopen \"%s\"\n", progname,
 					master_name);
 				exit(1);
-- 
cgit v1.2.3