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>

4 files changed, 42 insertions, 21 deletions

diff --git a/rose/rsattach.c b/rose/rsattach.c
index f91935e..2afdc67 100644
--- a/rose/rsattach.c
+++ b/rose/rsattach.c
@@ -38,7 +38,8 @@ static int readconfig(char *port)
 	char buffer[90], *s;
 	int n = 0;
 
-	if ((fp = fopen(CONF_RSPORTS_FILE, "r")) == NULL) {
+	fp = fopen(CONF_RSPORTS_FILE, "r");
+	if (fp == NULL) {
 		fprintf(stderr, "rsattach: cannot open rsports file\n");
 		return FALSE;
 	}
@@ -46,13 +47,15 @@ static int readconfig(char *port)
 	while (fgets(buffer, 90, fp) != NULL) {
 		n++;
 
-		if ((s = strchr(buffer, '\n')) != NULL)
+		s = strchr(buffer, '\n');
+		if (s != NULL)
 			*s = '\0';
 
 		if (strlen(buffer) > 0 && *buffer == '#')
 			continue;
 
-		if ((s = strtok(buffer, " \t\r\n")) == NULL) {
+		s = strtok(buffer, " \t\r\n");
+		if (s == NULL) {
 			fprintf(stderr, "rsattach: unable to parse line %d of the rsports file\n", n);
 			return FALSE;
 		}
@@ -60,7 +63,8 @@ static int readconfig(char *port)
 		if (strcmp(s, port) != 0)
 			continue;
 
-		if ((s = strtok(NULL, " \t\r\n")) == NULL) {
+		s = strtok(NULL, " \t\r\n");
+		if (s == NULL) {
 			fprintf(stderr, "rsattach: unable to parse line %d of the rsports file\n", n);
 			return FALSE;
 		}
@@ -85,7 +89,8 @@ static int getfreedev(char *dev)
 	int fd;
 	int i;
 
-	if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+	fd = socket(AF_INET, SOCK_DGRAM, 0);
+	if (fd < 0) {
 		perror("rsattach: socket");
 		return FALSE;
 	}
@@ -116,7 +121,8 @@ static int startiface(char *dev, struct hostent *hp)
 	char addr[5];
 	int fd;
 
-	if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+	fd = socket(AF_INET, SOCK_DGRAM, 0);
+	if (fd < 0) {
 		perror("rsattach: socket");
 		return FALSE;
 	}
@@ -187,7 +193,8 @@ int main(int argc, char *argv[])
 	while ((fd = getopt(argc, argv, "i:m:v")) != -1) {
 		switch (fd) {
 		case 'i':
-			if ((hp = gethostbyname(optarg)) == NULL) {
+			hp = gethostbyname(optarg);
+			if (hp == NULL) {
 				fprintf(stderr, "rsattach: invalid internet name/address - %s\n", optarg);
 				return 1;
 			}
diff --git a/rose/rsdwnlnk.c b/rose/rsdwnlnk.c
index cd9d44d..df8f893 100644
--- a/rose/rsdwnlnk.c
+++ b/rose/rsdwnlnk.c
@@ -78,7 +78,8 @@ int main(int argc, char **argv)
 	axbind.fsa_ax25.sax25_ndigis = 1;
 	axbind.fsa_ax25.sax25_call   = rosepeer.srose_call;
 
-	if ((addr = ax25_config_get_addr(argv[1])) == NULL) {
+	addr = ax25_config_get_addr(argv[1]);
+	if (addr == NULL) {
 		syslog(LOG_ERR, "invalid AX.25 port name - %s\n", argv[1]);
 		closelog();
 		return 1;
@@ -155,7 +156,8 @@ int main(int argc, char **argv)
 	/*
 	 * Open the socket into the kernel.
 	 */
-	if ((s = socket(AF_AX25, SOCK_SEQPACKET, 0)) < 0) {
+	s = socket(AF_AX25, SOCK_SEQPACKET, 0);
+	if (s < 0) {
 		syslog(LOG_ERR, "cannot open AX.25 socket, %s\n", strerror(errno));
 		closelog();
 		return 1;
@@ -240,7 +242,8 @@ int main(int argc, char **argv)
 		select(s + 1, &read_fd, NULL, NULL, NULL);
 
 		if (FD_ISSET(s, &read_fd)) {
-			if ((n = read(s, buffer + 2, sizeof(buffer)-2)) == -1)
+			n = read(s, buffer + 2, sizeof(buffer) - 2);
+			if (n == -1)
 				break;
 			if (buffer[2] == 0xF0) {
 				buffer[2] = 0;
@@ -253,7 +256,8 @@ int main(int argc, char **argv)
 		}
 
 		if (FD_ISSET(STDIN_FILENO, &read_fd)) {
-			if ((n = read(STDIN_FILENO, buffer, 512)) == -1) {
+			n = read(STDIN_FILENO, buffer, 512);
+			if (n == -1) {
 				close(s);
 				break;
 			}
diff --git a/rose/rsparms.c b/rose/rsparms.c
index f975070..419c5ed 100644
--- a/rose/rsparms.c
+++ b/rose/rsparms.c
@@ -31,7 +31,8 @@ static void printnb(char *neigh)
 	char buff[80];
 	int args;
 
-	if ((fp=fopen(PROC_RS_NEIGH_FILE,"r"))==NULL) {
+	fp = fopen(PROC_RS_NEIGH_FILE, "r");
+	if (fp == NULL) {
 		fprintf(stderr,"rsparms: Couldn't open %s file\n",PROC_RS_NEIGH_FILE);
 		exit(1);
 	}
@@ -86,7 +87,8 @@ static void nodes(int s, int argc, char *argv[])
 	}
 
 	if (argv[2][0] == 'l') {
-		if ((fn=fopen(PROC_RS_NODES_FILE,"r"))==NULL) {
+		fn = fopen(PROC_RS_NODES_FILE, "r");
+		if (fn == NULL) {
 			fprintf(stderr,"rsparms: Couldn't open %s file\n",PROC_RS_NODES_FILE);
 			exit(1);
 		}
@@ -153,7 +155,8 @@ static void nodes(int s, int argc, char *argv[])
 		exit(1);
 	}
 
-	if ((dev = ax25_config_get_dev(argv[4])) == NULL) {
+	dev = ax25_config_get_dev(argv[4]);
+	if (dev == NULL) {
 		fprintf(stderr, "rsparms: nodes: invalid port name - %s\n", argv[4]);
 		close(s);
 		exit(1);
@@ -225,7 +228,8 @@ int main(int argc, char *argv[])
 			rose_call = null_ax25_address;
 		}
 
-		if ((s = socket(AF_ROSE, SOCK_SEQPACKET, 0)) < 0) {
+		s = socket(AF_ROSE, SOCK_SEQPACKET, 0);
+		if (s < 0) {
 			perror("rsparms: socket");
 			return 1;
 		}
@@ -243,7 +247,8 @@ int main(int argc, char *argv[])
 
 	if (strncmp(argv[1], "-n", 2) == 0) {
 
-		if ((s = socket(AF_ROSE, SOCK_SEQPACKET, 0)) < 0) {
+		s = socket(AF_ROSE, SOCK_SEQPACKET, 0);
+		if (s < 0) {
 			perror("rsparms: socket");
 			return 1;
 		}
diff --git a/rose/rsuplnk.c b/rose/rsuplnk.c
index 2ed59ce..ea29b74 100644
--- a/rose/rsuplnk.c
+++ b/rose/rsuplnk.c
@@ -82,7 +82,8 @@ int main(int argc, char **argv)
 	roseconnect.srose_ndigis = rosebind.srose_ndigis = 0;
 	addrlen = sizeof(struct sockaddr_rose);
 
-	if ((addr = rs_config_get_addr(argv[1])) == NULL) {
+	addr = rs_config_get_addr(argv[1]);
+	if (addr == NULL) {
 		syslog(LOG_ERR, "invalid Rose port name - %s\n", argv[1]);
 		closelog();
 		return 1;
@@ -104,7 +105,8 @@ int main(int argc, char **argv)
 		addr = ax25_ntoa(&ax25peer.fsa_digipeater[n]);
 
 		if (strspn(addr, "0123456789-") == strlen(addr)) {
-			if ((p = strchr(addr, '-')) != NULL)
+			p = strchr(addr, '-');
+			if (p != NULL)
 				*p = '\0';
 			switch (strlen(addr)) {
 			case 4:
@@ -168,7 +170,8 @@ int main(int argc, char **argv)
 	/*
 	 * Open the socket into the kernel.
 	 */
-	if ((s = socket(AF_ROSE, SOCK_SEQPACKET, 0)) < 0) {
+	s = socket(AF_ROSE, SOCK_SEQPACKET, 0);
+	if (s < 0) {
 		syslog(LOG_ERR, "cannot open ROSE socket, %s\n", strerror(errno));
 		closelog();
 		return 1;
@@ -253,7 +256,8 @@ int main(int argc, char **argv)
 		select(s + 1, &read_fd, NULL, NULL, NULL);
 
 		if (FD_ISSET(s, &read_fd)) {
-			if ((n = read(s, buffer, 512)) == -1) {
+			n = read(s, buffer, 512);
+			if (n == -1) {
 				strcpy(buffer, "\r*** Disconnected - 0000 - DTE Originated\r");
 				write(STDOUT_FILENO, buffer, strlen(buffer));
 				break;
@@ -268,7 +272,8 @@ int main(int argc, char **argv)
 		}
 
 		if (FD_ISSET(STDIN_FILENO, &read_fd)) {
-			if ((n = read(STDIN_FILENO, buffer + 2, sizeof(buffer)-2)) == -1) {
+			n = read(STDIN_FILENO, buffer + 2, sizeof(buffer) - 2);
+			if (n == -1) {
 				close(s);
 				break;
 			}