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>

42 files changed, 439 insertions, 219 deletions

diff --git a/6pack/m6pack.c b/6pack/m6pack.c
index edc6014..aa18579 100644
--- a/6pack/m6pack.c
+++ b/6pack/m6pack.c
@@ -487,12 +487,14 @@ int main(int argc, char *argv[])
 	 * non-blocking so it won't block regardless of the modem
 	 * status lines.
 	 */
-	if ((tty = calloc(1, sizeof(struct iface))) == NULL) {
+	tty = calloc(1, sizeof(struct iface));
+	if (tty == NULL) {
 		perror("m6pack: malloc");
 		return 1;
 	}
 
-	if ((tty->fd = open(argv[optind], O_RDWR | O_NDELAY)) == -1) {
+	tty->fd = open(argv[optind], O_RDWR | O_NDELAY);
+	if (tty->fd == -1) {
 		perror("m6pack: open");
 		return 1;
 	}
@@ -517,11 +519,13 @@ int main(int argc, char *argv[])
 		static char name_ptmx[] = "/dev/ptmx";
 		char *pty_name = (i < numptys ? argv[optind+i+1] : name_ptmx);
 
-		if ((pty[i] = calloc(1, sizeof(struct iface))) == NULL) {
+		pty[i] = calloc(1, sizeof(struct iface));
+		if (pty[i] == NULL) {
 			perror("m6pack: malloc");
 			return 1;
 		}
-		if ((pty[i]->fd = open(pty_name, O_RDWR)) == -1) {
+		pty[i]->fd = open(pty_name, O_RDWR);
+		if (pty[i]->fd == -1) {
 			perror("m6pack: open");
 			return 1;
 		}
@@ -533,7 +537,8 @@ int main(int argc, char *argv[])
 		pty[i]->namepts[0] = '\0';
 		if (!strcmp(pty[i]->name, "/dev/ptmx")) {
 			/* get name of pts-device */
-			if ((npts = ptsname(pty[i]->fd)) == NULL) {
+			npts = ptsname(pty[i]->fd);
+			if (npts == NULL) {
 				fprintf(stderr, "m6pack: Cannot get name of pts-device.\n");
 				return 1;
 			}
@@ -627,8 +632,8 @@ int main(int argc, char *argv[])
 			}
 
 			for (icp = ibuf; size > 0; size--, icp++) {
-				if ((len = sixpack_rx(tty,*icp,&tnc_addr,
-						      &type)) != 0) {
+				len = sixpack_rx(tty, *icp, &tnc_addr, &type);
+				if (len != 0) {
 					if (tnc_addr <= numptys) {
 						sixpack_tx(pty[tnc_addr]->fd,
 							   0,
@@ -659,10 +664,9 @@ int main(int argc, char *argv[])
 				}
 
 				for (icp = ibuf; size > 0; size--, icp++) {
-					if ((len = sixpack_rx(pty[i],
-							      *icp,
-							      &tnc_addr,
-							      &type)) != 0) {
+					len = sixpack_rx(pty[i], *icp,
+							 &tnc_addr, &type);
+					if (len != 0) {
 						sixpack_tx(tty->fd, i,
 							   (type == data) ?
 							   pty[i]->databuf :
diff --git a/ax25/access.c b/ax25/access.c
index 951830c..2ecbb1d 100644
--- a/ax25/access.c
+++ b/ax25/access.c
@@ -204,7 +204,9 @@ static void write_example_passwd(char *pwfile, char pwlocation,
 	FILE * f;
 	int i;
 
-	if ((i = open(pwfile, O_CREAT|O_WRONLY|O_TRUNC, (S_IRUSR | S_IWUSR | (pwlocation == SYSTEMPW ? (S_IRGRP /* | S_IWGRP */ ) : 0)))) == -1)
+	i = open(pwfile, O_CREAT | O_WRONLY | O_TRUNC,
+		 (S_IRUSR | S_IWUSR | (pwlocation == SYSTEMPW ? (S_IRGRP /* | S_IWGRP */) : 0)));
+	if (i == -1)
 		return;
 	fchown(i, (pwlocation == SYSTEMPW ? 0 : pw->pw_uid), (pwlocation == SYSTEMPW ? 0 : pw->pw_gid));
 	close(i);
diff --git a/ax25/ax25d.c b/ax25/ax25d.c
index af75d85..346ba90 100644
--- a/ax25/ax25d.c
+++ b/ax25/ax25d.c
@@ -518,15 +518,18 @@ static int ReadConfig(void)
 	signal(SIGALRM, SIG_IGN);
 	memset(&axl_defaults, 0, sizeof(axl_defaults));
 
-	if ((fp = fopen(ConfigFile, "r")) == NULL)
+	fp = fopen(ConfigFile, "r");
+	if (fp == NULL)
 		return -1;
 
 	while (fgets(buffer, sizeof(buffer), fp) != NULL) {
 		line++;
 
-		if ((s = strchr(buffer, '\n')) != NULL)
+		s = strchr(buffer, '\n');
+		if (s != NULL)
 			*s = '\0';
-		if ((s = strchr(buffer, '\r')) != NULL)
+		s = strchr(buffer, '\r');
+		if (s != NULL)
 			*s = '\0';
 
 		if (buffer[0] == '#')
@@ -563,23 +566,28 @@ static int ReadConfig(void)
 
 			switch (af_type) {
 			case AF_AX25:
-				if ((s = strchr(buffer, ']')) == NULL)
+				s = strchr(buffer, ']');
+				if (s == NULL)
 					goto BadLine;
 				*s = '\0';
-				if ((s = strtok(buffer + 1, " \t")) == NULL)
+				s = strtok(buffer + 1, " \t");
+				if (s == NULL)
 					goto BadLine;
 				port = s;
 				call = NULL;
-				if ((s = strtok(NULL, " \t")) != NULL) {
+				s = strtok(NULL, " \t");
+				if (s != NULL) {
 					if (strcasecmp(s, "VIA") == 0 || strcasecmp(s, "V") == 0) {
-						if ((s = strtok(NULL, " \t")) == NULL)
+						s = strtok(NULL, " \t");
+						if (s == NULL)
 							goto BadLine;
 					}
 
 					call = port;
 					port = s;
 
-					if ((s = strchr(call, '*')) != NULL) {
+					s = strchr(call, '*');
+					if (s != NULL) {
 						*s = '\0';
 					}
 				}
@@ -588,7 +596,8 @@ static int ReadConfig(void)
 					continue;
 				}
 				if (strcmp(port, "*") != 0) {
-					if ((addr = ax25_config_get_addr(port)) == NULL) {
+					addr = ax25_config_get_addr(port);
+					if (addr == NULL) {
 						fprintf(stderr, "ax25d: invalid AX.25 port '%s'\n", port);
 						continue;
 					}
@@ -610,11 +619,13 @@ static int ReadConfig(void)
 				break;
 
 			case AF_NETROM:
-				if ((s = strchr(buffer, '>')) == NULL)
+				s = strchr(buffer, '>');
+				if (s == NULL)
 					goto BadLine;
 				*s = '\0';
 				port = buffer + 1;
-				if ((addr = nr_config_get_addr(port)) == NULL) {
+				addr = nr_config_get_addr(port);
+				if (addr == NULL) {
 					fprintf(stderr, "ax25d: invalid NET/ROM port '%s'\n", port);
 					continue;
 				}
@@ -625,20 +636,25 @@ static int ReadConfig(void)
 				break;
 
 			case AF_ROSE:
-				if ((s = strchr(buffer, '}')) == NULL)
+				s = strchr(buffer, '}');
+				if (s == NULL)
 					goto BadLine;
 				*s = '\0';
-				if ((s = strtok(buffer + 1, " \t")) == NULL)
+				s = strtok(buffer + 1, " \t");
+				if (s == NULL)
 					goto BadLine;
 				call = s;
-				if ((s = strtok(NULL, " \t")) == NULL)
+				s = strtok(NULL, " \t");
+				if (s == NULL)
 					goto BadLine;
 				if (strcasecmp(s, "VIA") == 0 || strcasecmp(s, "V") == 0) {
-					if ((s = strtok(NULL, " \t")) == NULL)
+					s = strtok(NULL, " \t");
+					if (s == NULL)
 						goto BadLine;
 				}
 				port = s;
-				if ((addr = rs_config_get_addr(port)) == NULL) {
+				addr = rs_config_get_addr(port);
+				if (addr == NULL) {
 					fprintf(stderr, "ax25d: invalid Rose port '%s'\n", port);
 					continue;
 				}
@@ -661,7 +677,8 @@ static int ReadConfig(void)
 				exit(1);
 			}
 
-			if ((axl_port = calloc(1, sizeof(*axl_port))) == NULL) {
+			axl_port = calloc(1, sizeof(*axl_port));
+			if (axl_port == NULL) {
 				fprintf(stderr, "ax25d: out of memory\n");
 				goto Error;
 			}
@@ -669,7 +686,9 @@ static int ReadConfig(void)
 			axl_port->port    = strdup(port);
 			axl_port->af_type = af_type;
 
-			if ((axl_port->fd = socket(axl_port->af_type, SOCK_SEQPACKET, 0)) < 0) {
+			axl_port->fd = socket(axl_port->af_type,
+					      SOCK_SEQPACKET, 0);
+			if (axl_port->fd < 0) {
 				fprintf(stderr, "ax25d: socket: %s\n", strerror(errno));
 				free(axl_port->port);
 				free(axl_port);
@@ -708,14 +727,16 @@ static int ReadConfig(void)
 
 			hunt = FALSE;	/* Next lines will be entries */
 		} else {		/* This is an entry */
-			if ((axl_ent = calloc(1, sizeof(*axl_ent))) == NULL) {
+			axl_ent = calloc(1, sizeof(*axl_ent));
+			if (axl_ent == NULL) {
 				fprintf(stderr, "ax25d: out of memory\n");
 				goto Error;
 			}
 
 			axl_ent->af_type = axl_port->af_type;	/* Inherit this */
 
-			if ((call = strtok(buffer, " \t")) == NULL) {
+			call = strtok(buffer, " \t");
+			if (call == NULL) {
 				free(axl_ent);
 				continue;
 			}
@@ -723,7 +744,8 @@ static int ReadConfig(void)
 			strupr(call);
 
 			if (axl_ent->af_type == AF_NETROM) {
-				if ((s = strchr(call, '@')) != NULL) {
+				s = strchr(call, '@');
+				if (s != NULL) {
 					node = s + 1;
 					*s = '\0';
 
@@ -792,7 +814,8 @@ ignore:
 				axl_ent->call = strdup(call);
 
 			/* Window */
-			if ((s = strtok(NULL, " \t")) == NULL)
+			s = strtok(NULL, " \t");
+			if (s == NULL)
 				goto BadArgsFree;
 
 			if (!parameters) {
@@ -806,7 +829,8 @@ ignore:
 			}
 
 			/* T1 */
-			if ((s = strtok(NULL, " \t")) == NULL)
+			s = strtok(NULL, " \t");
+			if (s == NULL)
 				goto BadArgsFree;
 
 			if (!parameters) {
@@ -830,7 +854,8 @@ ignore:
 			}
 
 			/* T2 */
-			if ((s = strtok(NULL, " \t")) == NULL)
+			s = strtok(NULL, " \t");
+			if (s == NULL)
 				goto BadArgsFree;
 
 			if (!parameters) {
@@ -854,7 +879,8 @@ ignore:
 			}
 
 			/* T3 */
-			if ((s = strtok(NULL, " \t")) == NULL)
+			s = strtok(NULL, " \t");
+			if (s == NULL)
 				goto BadArgsFree;
 
 			if (!parameters) {
@@ -868,7 +894,8 @@ ignore:
 			}
 
 			/* Idle */
-			if ((s = strtok(NULL, " \t")) == NULL)
+			s = strtok(NULL, " \t");
+			if (s == NULL)
 				goto BadArgsFree;
 
 			if (!parameters) {
@@ -882,7 +909,8 @@ ignore:
 			}
 
 			/* N2 */
-			if ((s = strtok(NULL, " \t")) == NULL)
+			s = strtok(NULL, " \t");
+			if (s == NULL)
 				goto BadArgsFree;
 
 			if (!parameters) {
@@ -897,17 +925,20 @@ ignore:
 
 			if (!parameters) {
 				/* Flags */
-				if ((s = strtok(NULL, " \t")) == NULL)
+				s = strtok(NULL, " \t");
+				if (s == NULL)
 					goto BadArgsFree;
 
 				axl_ent->flags = ParseFlags(s, line);
 
 				if (!(axl_ent->flags & FLAG_LOCKOUT)) {
 					/* Get username */
-					if ((s = strtok(NULL, " \t")) == NULL)
+					s = strtok(NULL, " \t");
+					if (s == NULL)
 						goto BadArgsFree;
 
-					if ((pwd = getpwnam(s)) == NULL) {
+					pwd = getpwnam(s);
+					if (pwd == NULL) {
 						fprintf(stderr, "ax25d: UID for user '%s' is unknown, ignoring entry\n", s);
 						goto BadUID;
 					}
@@ -916,13 +947,15 @@ ignore:
 					axl_ent->gid = pwd->pw_gid;
 
 					/* Get exec file */
-					if ((s = strtok(NULL, " \t")) == NULL)
+					s = strtok(NULL, " \t");
+					if (s == NULL)
 						goto BadArgsFree;
 
 					axl_ent->exec = strdup(s);
 
 					/* Get command line */
-					if ((s = strtok(NULL, "")) == NULL)
+					s = strtok(NULL, "");
+					if (s == NULL)
 						goto BadArgsFree2;
 
 					axl_ent->shell = strdup(s);
@@ -990,7 +1023,8 @@ static char *stripssid(const char *call)
 
 	strcpy(newcall, call);
 
-	if ((s = strchr(newcall, '-')) != NULL)
+	s = strchr(newcall, '-');
+	if (s != NULL)
 		*s = '\0';
 
 	return newcall;
diff --git a/ax25/axctl.c b/ax25/axctl.c
index c27bcdf..942b902 100644
--- a/ax25/axctl.c
+++ b/ax25/axctl.c
@@ -40,7 +40,8 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	if ((addr = ax25_config_get_addr(argv[1])) == NULL) {
+	addr = ax25_config_get_addr(argv[1]);
+	if (addr == NULL) {
 		fprintf(stderr, "axctl: invalid port name - %s\n", argv[1]);
 		return 1;
 	}
@@ -52,7 +53,8 @@ int main(int argc, char **argv)
 	if (ax25_aton_entry(argv[3], (char *)&ax25_ctl.source_addr) == -1)
 		return 1;
 
-	if ((s = socket(AF_AX25, SOCK_SEQPACKET, 0)) < 0) {
+	s = socket(AF_AX25, SOCK_SEQPACKET, 0);
+	if (s < 0) {
 		perror("axctl: socket");
 		return 1;
 	}
diff --git a/ax25/axgetput/proto_bin.c b/ax25/axgetput/proto_bin.c
index 40d946d..69d12a4 100644
--- a/ax25/axgetput/proto_bin.c
+++ b/ax25/axgetput/proto_bin.c
@@ -168,7 +168,8 @@ int bput(void)
 				goto abort;
 			}
 		}
-		if ((fddata = open(filename, O_WRONLY | O_CREAT | O_EXCL, 0640)) < 0) {
+		fddata = open(filename, O_WRONLY | O_CREAT | O_EXCL, 0640);
+		if (fddata < 0) {
 			sprintf(err_msg, "error: cannot open %s (%s)\n", filename, strerror(errno));
 			write(fderr, "\r#NO#\r", 6);
 			return 1;
@@ -191,7 +192,10 @@ int bput(void)
 
 	for (;;) {
 
-		if ((len = my_read(fdin, buf, ((term_line || len_read_left > sizeof(buf)) ? sizeof(buf) : len_read_left), &is_eof, "\r")) < 1) {
+		len = my_read(fdin, buf,
+			      ((term_line || len_read_left > sizeof(buf)) ? sizeof(buf) : len_read_left),
+			      &is_eof, "\r");
+		if (len < 1) {
 			save_close(fddata);
 			sprintf(err_msg, "error: read failed (%s)\n", strerror(errno));
 			goto abort;
@@ -325,7 +329,8 @@ int bget(void) {
 	init_crc();
 
 	if (!fdin_is_pipe && *filename) {
-		if ((fddata = open(filename, O_RDONLY)) == -1) {
+		fddata = open(filename, O_RDONLY);
+		if (fddata == -1) {
 			sprintf(err_msg, "error: cannot open %s (%s)\n", filename, strerror(errno));
 			return 1;
 		}
@@ -440,7 +445,8 @@ int bget(void) {
 		FD_SET(fdin, &readfds);
 		if (select(fdin+1, &readfds, NULL, NULL, &timeout) &&
 		    FD_ISSET(fdin, &readfds)) {
-			if ((len = read(fdin, buf, sizeof(buf))) < 0) {
+			len = read(fdin, buf, sizeof(buf));
+			if (len < 0) {
 				sprintf(err_msg, "read from tty failed (%s)\n", strerror(errno));
 				save_close(fddata);
 				goto abort;
@@ -454,7 +460,10 @@ int bget(void) {
 		/* read data  */
 		if (!fdin_is_pipe || is_stream) {
 			p_buf = buf;
-			if ((len = my_read(fddata, buf, ((len_remains > BLOCKSIZ || is_stream) ? BLOCKSIZ : len_remains), &is_eof, NULL)) < 1) {
+			len = my_read(fddata, buf,
+				      ((len_remains > BLOCKSIZ || is_stream) ? BLOCKSIZ : len_remains),
+				      &is_eof, NULL);
+			if (len < 1) {
 				save_close(fddata);
 				if (len < 0) {
 					sprintf(err_msg, "error: read failed (%s)\n", strerror(errno));
diff --git a/ax25/axgetput/util.c b/ax25/axgetput/util.c
index c09de1a..a4a83c0 100644
--- a/ax25/axgetput/util.c
+++ b/ax25/axgetput/util.c
@@ -53,7 +53,8 @@ int my_read(int fd, char *s, int len_max, int *eof, char *p_break)
     int len;
     char *s_curr = s + len_got;
 
-    if ((len = read(fd, s_curr, (p_break ? 1 : len_max))) < 1) {
+    len = read(fd, s_curr, (p_break ? 1 : len_max));
+    if (len < 1) {
       if (len == -1 && errno == EAGAIN) {
 	sleep(10);
 	continue;
@@ -88,7 +89,8 @@ int secure_write(int fd, char *s, int len_write) {
 
   while (len_write_left_curr) {
     int len;
-    if ((len = write(fd, s, len_write_left_curr)) < 0) {
+    len = write(fd, s, len_write_left_curr);
+    if (len < 0) {
       if (len == -1 && errno == EAGAIN) {
 	sleep(10);
 	continue;
diff --git a/ax25/axparms.c b/ax25/axparms.c
index 6e6428d..6dda06b 100644
--- a/ax25/axparms.c
+++ b/ax25/axparms.c
@@ -135,7 +135,8 @@ static int routes(int s, int argc, char *argv[], ax25_address *callsign)
 	}
 
 	if (strcmp(argv[2], "list") == 0) {
-		if ((fp=fopen(PROC_AX25_ROUTE_FILE,"r")) == NULL) {
+		fp = fopen(PROC_AX25_ROUTE_FILE, "r");
+		if (fp == NULL) {
 			fprintf(stderr, "axparms: route: cannot open %s\n",
 PROC_AX25_ROUTE_FILE);
 			return 1;
@@ -184,7 +185,8 @@ static int associate(int s, int argc, char *argv[])
 			exit(1);
 		}
 
-		if ((fp = fopen(PROC_AX25_CALLS_FILE, "r")) == NULL) {
+		fp = fopen(PROC_AX25_CALLS_FILE, "r");
+		if (fp == NULL) {
 			fprintf(stderr, "axparms: associate: cannot open %s\n", PROC_AX25_CALLS_FILE);
 			return 1;
 		}
@@ -196,7 +198,8 @@ static int associate(int s, int argc, char *argv[])
 		while (fgets(buffer, 80, fp) != NULL) {
 			u = strtok(buffer, " \t\n");
 			c = strtok(NULL, " \t\n");
-			if ((pw = getpwuid(atoi(u))) != NULL)
+			pw = getpwuid(atoi(u));
+			if (pw != NULL)
 				printf("%-10s %s\n", pw->pw_name, c);
 		}
 
@@ -301,7 +304,8 @@ static int forward(int s, int argc, char *argv[])
 		return 1;
 	}
 
-	if ((addr = ax25_config_get_addr(argv[2])) == NULL) {
+	addr = ax25_config_get_addr(argv[2]);
+	if (addr == NULL) {
 		fprintf(stderr, "axparms: invalid port name - %s\n", argv[2]);
 		return 1;
 	}
@@ -320,7 +324,8 @@ static int forward(int s, int argc, char *argv[])
 		return 0;
 	}
 
-	if ((addr = ax25_config_get_addr(argv[3])) == NULL) {
+	addr = ax25_config_get_addr(argv[3]);
+	if (addr == NULL) {
 		fprintf(stderr, "axparms: invalid port name - %s\n", argv[3]);
 		return 1;
 	}
@@ -364,7 +369,8 @@ int main(int argc, char **argv)
 			return 1;
 		}
 
-		if ((s = socket(AF_AX25, SOCK_SEQPACKET, 0)) < 0) {
+		s = socket(AF_AX25, SOCK_SEQPACKET, 0);
+		if (s < 0) {
 			perror("axparms: socket");
 			return 1;
 		}
@@ -382,7 +388,8 @@ int main(int argc, char **argv)
 			return 1;
 		}
 
-		if ((s = socket(AF_AX25, SOCK_SEQPACKET, 0)) < 0) {
+		s = socket(AF_AX25, SOCK_SEQPACKET, 0);
+		if (s < 0) {
 			perror("axparms: socket");
 			return 1;
 		}
@@ -415,7 +422,8 @@ int main(int argc, char **argv)
 			return 1;
 		}
 
-		if ((addr = ax25_config_get_addr(argv[3])) == NULL) {
+		addr = ax25_config_get_addr(argv[3]);
+		if (addr == NULL) {
 			fprintf(stderr, "axparms: invalid port name - %s\n", argv[3]);
 			return 1;
 		}
@@ -423,7 +431,8 @@ int main(int argc, char **argv)
 		if (ax25_aton_entry(addr, callsign.ax25_call) == -1)
 			return 1;
 
-		if ((s = socket(AF_AX25, SOCK_SEQPACKET, 0)) < 0) {
+		s = socket(AF_AX25, SOCK_SEQPACKET, 0);
+		if (s < 0) {
 			perror("axparms: socket");
 			return 1;
 		}
@@ -441,7 +450,8 @@ int main(int argc, char **argv)
 			return 1;
 		}
 
-		if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+		s = socket(AF_INET, SOCK_DGRAM, 0);
+		if (s < 0) {
 			perror("axparms: socket");
 			return 1;
 		}
diff --git a/ax25/axspawn.c b/ax25/axspawn.c
index c9736b6..60fc836 100644
--- a/ax25/axspawn.c
+++ b/ax25/axspawn.c
@@ -648,7 +648,8 @@ static int read_ax25(char *s, int size)
 	int declen;
 	struct termios termios;
 
-	if ((len = read(0, s, size)) < 0)
+	len = read(0, s, size);
+	if (len < 0)
 		return len;
 
 	if (huffman) {
@@ -990,7 +991,8 @@ static void cleanup(char *tty)
 		gettimeofday(&tv, NULL);
 		ut_line->ut_tv.tv_sec = tv.tv_sec;
 		ut_line->ut_tv.tv_usec = tv.tv_usec;
-		if ((fp = fopen(_PATH_WTMP, "r+")) != NULL) {
+		fp = fopen(_PATH_WTMP, "r+");
+		if (fp != NULL) {
 			fseek(fp, 0L, SEEK_END);
 			if (fwrite(ut_line, sizeof(ut), 1, fp) != 1)
 				syslog(LOG_ERR, "Ooops, I think I've just barbecued your wtmp file\n");
@@ -1270,7 +1272,8 @@ static void read_config(void)
 	while (!feof(fp))
 	{
 		fgets(buf, sizeof(buf), fp);
-		if ((p = strchr(buf, '#')) || (p = strchr(buf, '\n')))
+		p = strchr(buf, '#');
+		if (p || (p = strchr(buf, '\n')))
 			*p='\0';
 
 		if (buf[0] != '\0')
@@ -1548,7 +1551,8 @@ int main(int argc, char **argv)
 		char *p_buf;
 		sprintf(buf, "Login (%s): ", user);
 		write_ax25(buf, strlen(buf), 1);
-		if ((cnt = read_ax25(buf, sizeof(buf)-1)) < 0)
+		cnt = read_ax25(buf, sizeof(buf) - 1);
+		if (cnt < 0)
 				exit(1);
 		buf[cnt] = 0;
 
diff --git a/ax25/axwrapper.c b/ax25/axwrapper.c
index 8f2390b..f58ec8d 100644
--- a/ax25/axwrapper.c
+++ b/ax25/axwrapper.c
@@ -92,7 +92,8 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	if ((stdoutbuf = malloc(paclen)) == NULL) {
+	stdoutbuf = malloc(paclen);
+	if (stdoutbuf == NULL) {
 		PERROR("axwrapper: malloc");
 		exit(1);
 	}
diff --git a/ax25/beacon.c b/ax25/beacon.c
index d4f39c7..79e918c 100644
--- a/ax25/beacon.c
+++ b/ax25/beacon.c
@@ -106,7 +106,8 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-	if ((portcall = ax25_config_get_addr(port)) == NULL) {
+	portcall = ax25_config_get_addr(port);
+	if (portcall == NULL) {
 		fprintf(stderr, "beacon: invalid AX.25 port setting - %s\n", port);
 		return 1;
 	}
@@ -121,7 +122,8 @@ int main(int argc, char *argv[])
 	if (addr == NULL)
 		return 1;
 
-	if ((dlen = ax25_aton(addr, &dest)) == -1) {
+	dlen = ax25_aton(addr, &dest);
+	if (dlen == -1) {
 		fprintf(stderr, "beacon: unable to convert callsign '%s'\n", addr);
 		return 1;
 	}
@@ -131,15 +133,18 @@ int main(int argc, char *argv[])
 	}
 
 	if (srccall != NULL && strcmp(srccall, portcall) != 0) {
-		if ((addr = malloc(strlen(srccall) + 1 + strlen(portcall) + 1)) == NULL)
+		addr = malloc(strlen(srccall) + 1 + strlen(portcall) + 1);
+		if (addr == NULL)
 			return 1;
 		sprintf(addr, "%s %s", srccall, portcall);
 	} else {
-		if ((addr = strdup(portcall)) == NULL)
+		addr = strdup(portcall);
+		if (addr == NULL)
 			return 1;
 	}
 
-	if ((len = ax25_aton(addr, &src)) == -1) {
+	len = ax25_aton(addr, &src);
+	if (len == -1) {
 		fprintf(stderr, "beacon: unable to convert callsign '%s'\n", addr);
 		return 1;
 	}
@@ -171,7 +176,8 @@ int main(int argc, char *argv[])
 				sleep(t_sleep);
 		}
 
-		if ((s = socket(AF_AX25, SOCK_DGRAM, 0)) == -1) {
+		s = socket(AF_AX25, SOCK_DGRAM, 0);
+		if (s == -1) {
 			if (logging) {
 				syslog(LOG_ERR, "socket: %m");
 				closelog();
diff --git a/ax25/mheard.c b/ax25/mheard.c
index 2acd125..b4c631d 100644
--- a/ax25/mheard.c
+++ b/ax25/mheard.c
@@ -83,7 +83,8 @@ static void PrintPortEntry(struct PortRecord *pr, int data)
 			strftime(lh, sizeof(lh),"%Y-%m-%d %H:%M:%S", loc) == 0)
 			return;
 		call =  ax25_ntoa(&pr->entry.from_call);
-		if ((s = strstr(call, "-0")) != NULL)
+		s = strstr(call, "-0");
+		if (s != NULL)
 			*s = '\0';
 		printf("%-9s  %-5s  %8u   %s\n",
 			call, pr->entry.portname, pr->entry.count, lh);
@@ -91,18 +92,21 @@ static void PrintPortEntry(struct PortRecord *pr, int data)
 	case 1:
 		buffer[0] = '\0';
 		call = ax25_ntoa(&pr->entry.from_call);
-		if ((s = strstr(call, "-0")) != NULL)
+		s = strstr(call, "-0");
+		if (s != NULL)
 			*s = '\0';
 		strcat(buffer, call);
 		call = ax25_ntoa(&pr->entry.to_call);
-		if ((s = strstr(call, "-0")) != NULL)
+		s = strstr(call, "-0");
+		if (s != NULL)
 			*s = '\0';
 		strcat(buffer, ">");
 		strcat(buffer, call);
 		for (i = 0; i < pr->entry.ndigis && i < 4; i++) {
 			strcat(buffer, ",");
 			call = ax25_ntoa(&pr->entry.digis[i]);
-			if ((s = strstr(call, "-0")) != NULL)
+			s = strstr(call, "-0");
+			if (s != NULL)
 				*s = '\0';
 			strcat(buffer, call);
 		}
@@ -121,7 +125,8 @@ static void PrintPortEntry(struct PortRecord *pr, int data)
 			strftime(fh, sizeof(fh),"%Y-%m-%d %H:%M:%S", loc) == 0)
 			return;
 		call = ax25_ntoa(&pr->entry.from_call);
-		if ((s = strstr(call, "-0")) != NULL)
+		s = strstr(call, "-0");
+		if (s != NULL)
 			*s = '\0';
 		printf("%-9s  %-5s  %8u %8u %8u  %s  %s\n",
 			call, pr->entry.portname, pr->entry.iframes, pr->entry.sframes, pr->entry.uframes, fh, lh);
@@ -130,7 +135,8 @@ static void PrintPortEntry(struct PortRecord *pr, int data)
 		if (!pr->entry.count)
 			return;
 		call = ax25_ntoa(&pr->entry.from_call);
-		if ((s = strstr(call, "-0")) != NULL)
+		s = strstr(call, "-0");
+		if (s != NULL)
 			*s = '\0';
 		if (pr->entry.type > sizeof(types))
 			return;
@@ -176,7 +182,8 @@ static void PrintPortEntry(struct PortRecord *pr, int data)
 			strftime(fh, sizeof(fh),"%Y-%m-%d %H:%M:%S", loc) == 0)
 			return;
 		call = ax25_ntoa(&pr->entry.from_call);
-		if ((s = strstr(call, "-0")) != NULL)
+		s = strstr(call, "-0");
+		if (s != NULL)
 			*s = '\0';
 		printf("%-9s  %-5s  %8u %8u %8u  %s  %s  %8u %5s ",
 			call, pr->entry.portname, pr->entry.iframes, pr->entry.sframes, pr->entry.uframes, fh, lh, pr->entry.count, types[pr->entry.type]);
@@ -212,7 +219,8 @@ static void PrintPortEntry(struct PortRecord *pr, int data)
 			if (i)
 				strcat(buffer, ",");
 			call = ax25_ntoa(&pr->entry.digis[i]);
-			if ((s = strstr(call, "-0")) != NULL)
+			s = strstr(call, "-0");
+			if (s != NULL)
 				*s = '\0';
 			strcat(buffer, call);
 		}
@@ -244,7 +252,8 @@ static void LoadPortData(void)
 	struct PortRecord *pr;
 	struct mheard_struct mheard;
 
-	if ((fp = fopen(DATA_MHEARD_FILE, "r")) == NULL) {
+	fp = fopen(DATA_MHEARD_FILE, "r");
+	if (fp == NULL) {
 		fprintf(stderr, "mheard: cannot open mheard data file\n");
 		exit(1);
 	}
diff --git a/ax25/mheardd.c b/ax25/mheardd.c
index a1c121b..53b1f68 100644
--- a/ax25/mheardd.c
+++ b/ax25/mheardd.c
@@ -164,7 +164,9 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	if ((mheard_list = calloc(mheard_list_size, sizeof(struct mheard_list_struct))) == NULL) {
+	mheard_list = calloc(mheard_list_size,
+			     sizeof(struct mheard_list_struct));
+	if (mheard_list == NULL) {
 		fprintf(stderr, "mheardd: cannot allocate memory\n");
 		return 1;
 	}
@@ -187,11 +189,13 @@ int main(int argc, char **argv)
 
 		fclose(fp);
 	} else {
-		if ((fp = fopen(DATA_MHEARD_FILE, "w")) != NULL)
+		fp = fopen(DATA_MHEARD_FILE, "w");
+		if (fp != NULL)
 			fclose(fp);
 	}
 
-	if ((s = socket(PF_PACKET, SOCK_PACKET, htons(ETH_P_AX25))) == -1) {
+	s = socket(PF_PACKET, SOCK_PACKET, htons(ETH_P_AX25));
+	if (s == -1) {
 		perror("mheardd: socket");
 		return 1;
 	}
@@ -210,7 +214,8 @@ int main(int argc, char **argv)
 	for (;;) {
 		asize = sizeof(sa);
 
-		if ((size = recvfrom(s, buffer, sizeof(buffer), 0, &sa, &asize)) == -1) {
+		size = recvfrom(s, buffer, sizeof(buffer), 0, &sa, &asize);
+		if (size == -1) {
 			if (logging) {
 				syslog(LOG_ERR, "recv: %m");
 				closelog();
@@ -218,7 +223,8 @@ int main(int argc, char **argv)
 			return 1;
 		}
 
-		if ((port = ax25_config_get_name(sa.sa_data)) == NULL) {
+		port = ax25_config_get_name(sa.sa_data);
+		if (port == NULL) {
 			if (logging)
 				syslog(LOG_WARNING, "unknown port '%s'\n", sa.sa_data);
 			continue;
@@ -392,7 +398,8 @@ int main(int argc, char **argv)
 
 		time(&mheard->entry.last_heard);
 
-		if ((fp = fopen(DATA_MHEARD_FILE, "r+")) == NULL) {
+		fp = fopen(DATA_MHEARD_FILE, "r+");
+		if (fp == NULL) {
 			if (logging)
 				syslog(LOG_ERR, "cannot open mheard data file\n");
 			continue;
diff --git a/ax25/rxecho.c b/ax25/rxecho.c
index bfc326a..14a5040 100644
--- a/ax25/rxecho.c
+++ b/ax25/rxecho.c
@@ -176,7 +176,8 @@ static struct config *readconfig(void)
 	char line[80], *cp, *dev;
 	struct config *p, *list = NULL;
 
-	if ((fp = fopen(CONF_RXECHO_FILE, "r")) == NULL) {
+	fp = fopen(CONF_RXECHO_FILE, "r");
+	if (fp == NULL) {
 		fprintf(stderr, "rxecho: cannot open config file\n");
 		return NULL;
 	}
@@ -187,12 +188,14 @@ static struct config *readconfig(void)
 		if (cp == NULL || cp[0] == '#')
 			continue;
 
-		if ((p = calloc(1, sizeof(struct config))) == NULL) {
+		p = calloc(1, sizeof(struct config));
+		if (p == NULL) {
 			perror("rxecho: malloc");
 			return NULL;
 		}
 
-		if ((dev = ax25_config_get_dev(cp)) == NULL) {
+		dev = ax25_config_get_dev(cp);
+		if (dev == NULL) {
 			fprintf(stderr, "rxecho: invalid port name - %s\n", cp);
 			return NULL;
 		}
@@ -200,12 +203,14 @@ static struct config *readconfig(void)
 		strcpy(p->from, dev);
 		p->from_idx = -1;
 
-		if ((cp = strtok(NULL, " \t\r\n")) == NULL) {
+		cp = strtok(NULL, " \t\r\n");
+		if (cp == NULL) {
 			fprintf(stderr, "rxecho: config file error.\n");
 			return NULL;
 		}
 
-		if ((dev = ax25_config_get_dev(cp)) == NULL) {
+		dev = ax25_config_get_dev(cp);
+		if (dev == NULL) {
 			fprintf(stderr, "rxecho: invalid port name - %s\n", cp);
 			return NULL;
 		}
@@ -394,11 +399,13 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	if ((list = readconfig()) == NULL)
+	list = readconfig();
+	if (list == NULL)
 		return 1;
 
 #ifdef	USE_SOCKADDR_SLL
-	if ((s = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_AX25))) == -1) {
+	s = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_AX25));
+	if (s == -1) {
 #else
 	if ((s = socket(AF_INET, SOCK_PACKET, htons(ETH_P_AX25))) == -1) {
 #endif
@@ -450,7 +457,8 @@ int main(int argc, char **argv)
 	for (;;) {
 		alen = sa_len;
 
-		if ((size = recvfrom(s, buf, 1500, 0, psa, &alen)) == -1) {
+		size = recvfrom(s, buf, 1500, 0, psa, &alen);
+		if (size == -1) {
 			if (logging) {
 				syslog(LOG_ERR, "recvfrom: %m");
 				closelog();
diff --git a/dmascc/dmascc_cfg.c b/dmascc/dmascc_cfg.c
index 229090e..4e92a8c 100644
--- a/dmascc/dmascc_cfg.c
+++ b/dmascc/dmascc_cfg.c
@@ -96,7 +96,8 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-	if ((sk = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+	sk = socket(AF_INET, SOCK_DGRAM, 0);
+	if (sk < 0) {
 		perror("socket");
 		return 2;
 	}
diff --git a/hdlcutil/hdrvcomm.c b/hdlcutil/hdrvcomm.c
index 1e0b806..a037fac 100644
--- a/hdlcutil/hdrvcomm.c
+++ b/hdlcutil/hdrvcomm.c
@@ -201,7 +201,8 @@ void hdrvc_init(void)
 		if (fd >= 0)
 			close(fd);
 		afpacket = 0;
-		if ((fd = socket(PF_INET, SOCK_PACKET, htons(ETH_P_AX25))) < 0) {
+		fd = socket(PF_INET, SOCK_PACKET, htons(ETH_P_AX25));
+		if (fd < 0) {
 			fprintf(stderr, "%s: Error %s (%i), cannot open %s\n",
 				prg_name,
 				strerror(errno), errno, if_name);
@@ -234,7 +235,8 @@ void hdrvc_init(void)
 			strerror(errno), errno, if_name);
 		exit(-1);
 	}
-	if ((msqid = msgget(k, 0700)) < 0) {
+	msqid = msgget(k, 0700);
+	if (msqid < 0) {
 		fprintf(stderr, "%s: Error %s (%i), cannot msgget %d\n", prg_name,
 			strerror(errno), errno, k);
 		exit(-1);
@@ -255,7 +257,9 @@ static int hdrvc_recvmsg(struct usersmmsg *msg, int maxlen, long type)
 {
 	int len;
 
-	if ((len = msgrcv(msqid, (struct msgbuf *)msg, maxlen-sizeof(long), type, MSG_NOERROR)) < 0) {
+	len = msgrcv(msqid, (struct msgbuf *)msg, maxlen - sizeof(long), type,
+		     MSG_NOERROR);
+	if (len < 0) {
 		perror("msgrcv");
 		exit(1);
 	}
@@ -405,7 +409,8 @@ int hdrvc_get_channel_access_param(struct hdrvc_channel_params *par)
 	int ret;
 	struct usersmmsg msg;
 
-	if ((ret = hdrvc_hdlcdrv_ioctl(HDLCDRVCTL_GETCHANNELPAR, &hi)) < 0)
+	ret = hdrvc_hdlcdrv_ioctl(HDLCDRVCTL_GETCHANNELPAR, &hi);
+	if (ret < 0)
 		return ret;
 	if (!par) {
 		errno = EINVAL;
@@ -449,7 +454,8 @@ int hdrvc_set_channel_access_param(struct hdrvc_channel_params par)
 	hi.data.cp.slottime = par.slottime;
 	hi.data.cp.ppersist = par.ppersist;
 	hi.data.cp.fulldup = par.fulldup;
-	if ((ret = hdrvc_hdlcdrv_ioctl(HDLCDRVCTL_SETCHANNELPAR, &hi)) < 0)
+	ret = hdrvc_hdlcdrv_ioctl(HDLCDRVCTL_SETCHANNELPAR, &hi);
+	if (ret < 0)
 		return ret;
 	return 0;
 	msg.hdr.type = USERSM_CMD_SET_CHACCESS_PAR;
@@ -549,7 +555,8 @@ int hdrvc_diag2(unsigned int mode, unsigned int flags, short *data,
 	smi.data.diag.samplesperbit = 0;
 	smi.data.diag.datalen = maxdatalen;
 	smi.data.diag.data = data;
-	if ((ret = hdrvc_sm_ioctl(SMCTL_DIAGNOSE, &smi)) < 0)
+	ret = hdrvc_sm_ioctl(SMCTL_DIAGNOSE, &smi);
+	if (ret < 0)
 		return ret;
 	if (samplesperbit)
 		*samplesperbit = smi.data.diag.samplesperbit;
diff --git a/hdlcutil/smdiag.c b/hdlcutil/smdiag.c
index cb354f1..17ef026 100644
--- a/hdlcutil/smdiag.c
+++ b/hdlcutil/smdiag.c
@@ -368,8 +368,10 @@ int main(int argc, char *argv[])
 	}
 	printmode(mode, trigger);
 	for (;;) {
-		if ((ret = hdrvc_diag2(mode, trigger, data, sizeof(data) / sizeof(short),
-				       &samplesperbit)) < 0) {
+		ret = hdrvc_diag2(mode, trigger, data,
+				  sizeof(data) / sizeof(short),
+				  &samplesperbit);
+		if (ret < 0) {
 			perror("hdrvc_diag2");
 			exit(1);
 		}
diff --git a/hdlcutil/smmixer.c b/hdlcutil/smmixer.c
index 69c56f6..a8ce152 100644
--- a/hdlcutil/smmixer.c
+++ b/hdlcutil/smmixer.c
@@ -72,7 +72,8 @@ static unsigned char get_mixer_reg(unsigned char addr)
 	struct sm_mixer_data mixdat;
 
 	mixdat.reg = addr;
-	if ((i = do_mix_ioctl(SMCTL_GETMIXER, &mixdat)) < 0) {
+	i = do_mix_ioctl(SMCTL_GETMIXER, &mixdat);
+	if (i < 0) {
 		perror("do_mix_ioctl: SMCTL_GETMIXER");
 		exit(1);
 	}
@@ -389,21 +390,24 @@ static int set_mixer_ad1848(int argc, char *argv[])
 			}
 		} else if (!strncasecmp(argv[0], "sl=", 3)) {
 			mask |= 16;
-			if ((isrcl = parse_ad_src(argv[0]+3)) < 0) {
+			isrcl = parse_ad_src(argv[0] + 3);
+			if (isrcl < 0) {
 				fprintf(stderr, "invalid input source, must "
 					"be either line, aux1, mic or dac\n");
 				return -1;
 			}
 		} else if (!strncasecmp(argv[0], "sr=", 3)) {
 			mask |= 32;
-			if ((isrcr = parse_ad_src(argv[0]+3)) < 0) {
+			isrcr = parse_ad_src(argv[0] + 3);
+			if (isrcr < 0) {
 				fprintf(stderr, "invalid input source, must "
 					"be either line, aux1, mic or dac\n");
 				return -1;
 			}
 		} else if (!strncasecmp(argv[0], "s=", 2)) {
 			mask |= 48;
-			if ((isrcl = isrcr = parse_ad_src(argv[0]+2)) < 0) {
+			isrcl = isrcr = parse_ad_src(argv[0] + 2);
+			if (isrcl < 0) {
 				fprintf(stderr, "invalid input source, must "
 					"be either line, aux1, mic or dac\n");
 				return -1;
diff --git a/kiss/kissattach.c b/kiss/kissattach.c
index 9667da1..2b05956 100644
--- a/kiss/kissattach.c
+++ b/kiss/kissattach.c
@@ -68,7 +68,8 @@ static int readconfig(char *port)
 	char buffer[90], *s;
 	int n = 0;
 
-	if ((fp = fopen(CONF_AXPORTS_FILE, "r")) == NULL) {
+	fp = fopen(CONF_AXPORTS_FILE, "r");
+	if (fp == NULL) {
 		fprintf(stderr, "%s: cannot open axports file %s\n",
 			progname, CONF_AXPORTS_FILE);
 		return FALSE;
@@ -77,13 +78,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 (*buffer == 0 || *buffer == '#')
 			continue;
 
-		if ((s = strtok(buffer, " \t\r\n")) == NULL) {
+		s = strtok(buffer, " \t\r\n");
+		if (s == NULL) {
 			fprintf(stderr, "%s: unable to parse line %d of the axports file\n", progname, n);
 			return FALSE;
 		}
@@ -91,27 +94,31 @@ 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, "%s: unable to parse line %d of the axports file\n", progname, n);
 			return FALSE;
 		}
 
 		callsign = strdup(s);
 
-		if ((s = strtok(NULL, " \t\r\n")) == NULL) {
+		s = strtok(NULL, " \t\r\n");
+		if (s == NULL) {
 			fprintf(stderr, "%s: unable to parse line %d of the axports file\n", progname, n);
 			return FALSE;
 		}
 
 		speed = atoi(s);
 
-		if ((s = strtok(NULL, " \t\r\n")) == NULL) {
+		s = strtok(NULL, " \t\r\n");
+		if (s == NULL) {
 			fprintf(stderr, "%s: unable to parse line %d of the axports file\n", progname, n);
 			return FALSE;
 		}
 
 		if (mtu == 0) {
-			if ((mtu = atoi(s)) <= 0) {
+			mtu = atoi(s);
+			if (mtu <= 0) {
 				fprintf(stderr, "%s: invalid paclen setting\n", progname);
 				return FALSE;
 			}
@@ -153,7 +160,8 @@ static int startiface(char *dev, struct hostent *hp)
 	struct ifreq ifr;
 	int fd;
 
-	if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+	fd = socket(AF_INET, SOCK_DGRAM, 0);
+	if (fd < 0) {
 		fprintf(stderr, "%s: ", progname);
 		perror("socket");
 		return FALSE;
@@ -248,7 +256,8 @@ int main(int argc, char *argv[])
 			logging = TRUE;
 			break;
 		case 'm':
-			if ((mtu = atoi(optarg)) <= 0) {
+			mtu = atoi(optarg);
+			if (mtu <= 0) {
 				fprintf(stderr, "%s: invalid mtu size - %s\n", progname, optarg);
 				return 1;
 			}
@@ -296,7 +305,8 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-	if ((fd = open(kttyname, O_RDONLY | O_NONBLOCK)) == -1) {
+	fd = open(kttyname, O_RDONLY | O_NONBLOCK);
+	if (fd == -1) {
 		if (errno == ENOENT) {
 			fprintf(stderr, "%s: Cannot find serial device %s, no such file or directory.\n", progname, kttyname);
 		} else {
@@ -308,7 +318,8 @@ int main(int argc, char *argv[])
 
 	if (i_am_unix98_pty_master) {
 		/* get name of pts-device */
-		if ((namepts = ptsname(fd)) == NULL) {
+		namepts = ptsname(fd);
+		if (namepts == NULL) {
 			fprintf(stderr, "%s: Cannot get name of pts-device.\n", progname);
 			return 1;
 		}
diff --git a/kiss/kissnetd.c b/kiss/kissnetd.c
index abf9ee9..b0692df 100644
--- a/kiss/kissnetd.c
+++ b/kiss/kissnetd.c
@@ -131,7 +131,8 @@ static void ReopenPort(int PortNumber)
 		if (!strcmp(PortList[PortNumber]->Name, "/dev/ptmx")) {
 			char *npts;
 			/* get name of pts-device */
-			if ((npts = ptsname(PortList[PortNumber]->Fd)) == NULL) {
+			npts = ptsname(PortList[PortNumber]->Fd);
+			if (npts == NULL) {
 				sprintf(MyString, "Cannot get name of pts-device.\n");
 				syslog(LOG_WARNING, "kissnetd : Cannot get name of pts-device\n");
 				exit(1);
diff --git a/kiss/kissparms.c b/kiss/kissparms.c
index def7b59..7834162 100644
--- a/kiss/kissparms.c
+++ b/kiss/kissparms.c
@@ -153,7 +153,8 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-	if ((s = socket(PF_PACKET, SOCK_PACKET, htons(proto))) < 0) {
+	s = socket(PF_PACKET, SOCK_PACKET, htons(proto));
+	if (s < 0) {
 		perror("kissparms: socket");
 		return 1;
 	}
diff --git a/kiss/mkiss.c b/kiss/mkiss.c
index 35e7ed0..1747c33 100644
--- a/kiss/mkiss.c
+++ b/kiss/mkiss.c
@@ -510,12 +510,14 @@ int main(int argc, char *argv[])
 	 * non-blocking so it won't block regardless of the modem
 	 * status lines.
 	 */
-	if ((tty = calloc(1, sizeof(struct iface))) == NULL) {
+	tty = calloc(1, sizeof(struct iface));
+	if (tty == NULL) {
 		perror("mkiss: malloc");
 		return 1;
 	}
 
-	if ((tty->fd = open(argv[optind], O_RDWR | O_NDELAY)) == -1) {
+	tty->fd = open(argv[optind], O_RDWR | O_NDELAY);
+	if (tty->fd == -1) {
 		perror("mkiss: open");
 		return 1;
 	}
@@ -542,7 +544,8 @@ int main(int argc, char *argv[])
 		static char name_ptmx[] = "/dev/ptmx";
 		char *pty_name = (i < numptys ? argv[optind+i+1] : name_ptmx);
 
-		if ((pty[i] = calloc(1, sizeof(struct iface))) == NULL) {
+		pty[i] = calloc(1, sizeof(struct iface));
+		if (pty[i] == NULL) {
 			perror("mkiss: malloc");
 			return 1;
 		}
@@ -550,7 +553,8 @@ int main(int argc, char *argv[])
 			pty[i]->fd = -1;
 			strcpy(pty[i]->namepts, "none");
 		} else {
-			if ((pty[i]->fd = open(pty_name, O_RDWR)) == -1) {
+			pty[i]->fd = open(pty_name, O_RDWR);
+			if (pty[i]->fd == -1) {
 				perror("mkiss: open");
 				free(pty[i]);
 				pty[i] = NULL;
@@ -564,7 +568,8 @@ int main(int argc, char *argv[])
 		pty[i]->optr = pty[i]->obuf;
 		if (!strcmp(pty[i]->name, "/dev/ptmx")) {
 			/* get name of pts-device */
-			if ((npts = ptsname(pty[i]->fd)) == NULL) {
+			npts = ptsname(pty[i]->fd);
+			if (npts == NULL) {
 				fprintf(stderr, "mkiss: Cannot get name of pts-device.\n");
 				free(pty[i]);
 				pty[i] = NULL;
@@ -672,7 +677,8 @@ int main(int argc, char *argv[])
 				break;
 			}
 			for (icp = ibuf; size > 0; size--, icp++) {
-				if ((len = kiss_rx(tty, *icp, crcflag)) != 0) {
+				len = kiss_rx(tty, *icp, crcflag);
+				if (len != 0) {
 					if ((i = (*tty->obuf & 0xF0) >> 4) < numptys) {
 						if (pty[i]->fd != -1) {
 							kiss_tx(pty[i]->fd, 0, tty->obuf, len, FALSE);
@@ -698,7 +704,8 @@ int main(int argc, char *argv[])
 					goto end;
 				}
 				for (icp = ibuf; size > 0; size--, icp++) {
-					if ((len = kiss_rx(pty[i], *icp, FALSE)) != 0) {
+					len = kiss_rx(pty[i], *icp, FALSE);
+					if (len != 0) {
 						kiss_tx(tty->fd, i, pty[i]->obuf, len, crcflag);
 						tty->txpackets++;
 						tty->txbytes += len;
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);
diff --git a/netrom/netromd.c b/netrom/netromd.c
index 13737d8..dccba71 100644
--- a/netrom/netromd.c
+++ b/netrom/netromd.c
@@ -57,13 +57,15 @@ static int bcast_config_load_ports(void)
 	char buffer[255], port[32], *s;
 	FILE *fp;
 
-	if ((fp = fopen(CONF_NETROMD_FILE, "r")) == NULL) {
+	fp = fopen(CONF_NETROMD_FILE, "r");
+	if (fp == NULL) {
 		fprintf(stderr, "netromd: cannot open config file\n");
 		return -1;
 	}
 
 	while (fgets(buffer, 255, fp) != NULL) {
-		if ((s = strchr(buffer, '\n')) != NULL)
+		s = strchr(buffer, '\n');
+		if (s != NULL)
 			*s = '\0';
 
 		if (strlen(buffer) == 0 || buffer[0] == '#')
@@ -198,7 +200,8 @@ int main(int argc, char **argv)
 	ax25_aton_entry(nr_config_get_addr(NULL), (char *)&my_call);
 	ax25_aton_entry("NODES", (char *)&node_call);
 
-	if ((s = socket(PF_PACKET, SOCK_PACKET, htons(ETH_P_AX25))) == -1) {
+	s = socket(PF_PACKET, SOCK_PACKET, htons(ETH_P_AX25));
+	if (s == -1) {
 		perror("netromd: socket");
 		return 1;
 	}
@@ -226,7 +229,9 @@ int main(int argc, char **argv)
 		if (FD_ISSET(s, &fdset)) {
 			asize = sizeof(sa);
 
-			if ((size = recvfrom(s, buffer, sizeof(buffer), 0, &sa, &asize)) == -1) {
+			size = recvfrom(s, buffer, sizeof(buffer), 0, &sa,
+					&asize);
+			if (size == -1) {
 				if (logging) {
 					syslog(LOG_ERR, "recvfrom: %m");
 					closelog();
diff --git a/netrom/netromr.c b/netrom/netromr.c
index 63ac2bd..ccf6cd2 100644
--- a/netrom/netromr.c
+++ b/netrom/netromr.c
@@ -73,7 +73,8 @@ static int add_node(int s, unsigned char *buffer, struct nr_route_struct *nr_nod
 	best_quality = buffer[20];
 
 	nr_node->mnemonic[MNEMONIC_LEN] = '\0';
-	if ((p = strchr(nr_node->mnemonic, ' ')) != NULL)
+	p = strchr(nr_node->mnemonic, ' ');
+	if (p != NULL)
 		*p = '\0';
 
 	if (!validcallsign(&nr_node->callsign)) {
@@ -147,7 +148,8 @@ void receive_nodes(unsigned char *buffer, int length, ax25_address *neighbour, i
 
 	sprintf(neigh_buffer, "%s/obsolescence_count_initialiser", PROC_NR_SYSCTL_DIR);
 
-	if ((fp = fopen(neigh_buffer, "r")) == NULL) {
+	fp = fopen(neigh_buffer, "r");
+	if (fp == NULL) {
 		if (logging)
 			syslog(LOG_ERR, "netromr: cannot open %s\n", neigh_buffer);
 		return;
@@ -159,13 +161,15 @@ void receive_nodes(unsigned char *buffer, int length, ax25_address *neighbour, i
 
 	fclose(fp);
 
-	if ((s = socket(AF_NETROM, SOCK_SEQPACKET, 0)) < 0) {
+	s = socket(AF_NETROM, SOCK_SEQPACKET, 0);
+	if (s < 0) {
 		if (logging)
 			syslog(LOG_ERR, "netromr: socket: %m");
 		return;
 	}
 
-	if ((fp = fopen(PROC_NR_NEIGH_FILE, "r")) == NULL) {
+	fp = fopen(PROC_NR_NEIGH_FILE, "r");
+	if (fp == NULL) {
 		if (logging)
 			syslog(LOG_ERR, "netromr: cannot open %s\n", PROC_NR_NEIGH_FILE);
 		close(s);
@@ -199,7 +203,8 @@ void receive_nodes(unsigned char *buffer, int length, ax25_address *neighbour, i
 	memcpy(nr_node.mnemonic, buffer, MNEMONIC_LEN);
 	nr_node.mnemonic[MNEMONIC_LEN] = '\0';
 
-	if ((p = strchr(nr_node.mnemonic, ' ')) != NULL)
+	p = strchr(nr_node.mnemonic, ' ');
+	if (p != NULL)
 		*p = '\0';
 
 	if (!validmnemonic(nr_node.mnemonic)) {
diff --git a/netrom/netromt.c b/netrom/netromt.c
index bd51682..4c98f43 100644
--- a/netrom/netromt.c
+++ b/netrom/netromt.c
@@ -42,14 +42,16 @@ static void build_mine(int s, struct full_sockaddr_ax25 *dest, int dlen, int loc
 
 	len = build_header(message);
 
-	if ((fp = fopen(CONF_NRPORTS_FILE, "r")) == NULL) {
+	fp = fopen(CONF_NRPORTS_FILE, "r");
+	if (fp == NULL) {
 		if (logging)
 			syslog(LOG_ERR, "netromt: cannot open nrports file\n");
 		return;
 	}
 
 	while (fgets(buffer, 255, fp) != NULL) {
-		if ((p = strchr(buffer, '\n')) != NULL)
+		p = strchr(buffer, '\n');
+		if (p != NULL)
 			*p = '\0';
 
 		if (strlen(buffer) == 0 || buffer[0] == '#')
@@ -102,13 +104,15 @@ static void build_others(int s, int min_obs, struct full_sockaddr_ax25 *dest, in
 	int  quality, neigh_no, obs_count;
 	int  olen, len;
 
-	if ((fpnodes = fopen(PROC_NR_NODES_FILE, "r")) == NULL) {
+	fpnodes = fopen(PROC_NR_NODES_FILE, "r");
+	if (fpnodes == NULL) {
 		if (logging)
 			syslog(LOG_ERR, "netromt: cannot open %s\n", PROC_NR_NODES_FILE);
 		return;
 	}
 
-	if ((fpneigh = fopen(PROC_NR_NEIGH_FILE, "r")) == NULL) {
+	fpneigh = fopen(PROC_NR_NEIGH_FILE, "r");
+	if (fpneigh == NULL) {
 		if (logging)
 			syslog(LOG_ERR, "netromt: cannot open %s\n", PROC_NR_NEIGH_FILE);
 		fclose(fpnodes);
@@ -232,7 +236,8 @@ void transmit_nodes(int localval, int pause)
 		ax25_aton(path, &src);
 		slen = sizeof(struct full_sockaddr_ax25);
 
-		if ((s = socket(AF_AX25, SOCK_DGRAM, NETROM_PID)) < 0) {
+		s = socket(AF_AX25, SOCK_DGRAM, NETROM_PID);
+		if (s < 0) {
 			if (logging)
 				syslog(LOG_ERR, "netromt: socket: %m");
 			continue;
@@ -253,7 +258,8 @@ void transmit_nodes(int localval, int pause)
 		close(s);
 	}
 
-	if ((s = socket(AF_NETROM, SOCK_SEQPACKET, 0)) < 0) {
+	s = socket(AF_NETROM, SOCK_SEQPACKET, 0);
+	if (s < 0) {
 		if (logging)
 			syslog(LOG_ERR, "netromt: socket: %m");
 		exit(1);
diff --git a/netrom/nodesave.c b/netrom/nodesave.c
index c5f1487..4e8a7bf 100644
--- a/netrom/nodesave.c
+++ b/netrom/nodesave.c
@@ -61,7 +61,8 @@ int main(int argc, char **argv)
 	}
 
 	if ((argc - optind) == 1) {
-		if ((fp = fopen(argv[optind], "w")) == NULL) {
+		fp = fopen(argv[optind], "w");
+		if (fp == NULL) {
 			fprintf(stderr, "nodesave: cannot open file %s\n", argv[optind]);
 			return 1;
 		}
diff --git a/netrom/nrattach.c b/netrom/nrattach.c
index 66c85a0..3632836 100644
--- a/netrom/nrattach.c
+++ b/netrom/nrattach.c
@@ -37,7 +37,8 @@ static int readconfig(char *port)
 	char buffer[90], *s;
 	int n = 0;
 
-	if ((fp = fopen(CONF_NRPORTS_FILE, "r")) == NULL) {
+	fp = fopen(CONF_NRPORTS_FILE, "r");
+	if (fp == NULL) {
 		fprintf(stderr, "nrattach: cannot open nrports file\n");
 		return FALSE;
 	}
@@ -45,13 +46,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, "nrattach: unable to parse line %d of the nrports file\n", n);
 			return FALSE;
 		}
@@ -59,25 +62,29 @@ 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, "nrattach: unable to parse line %d of the nrports file\n", n);
 			return FALSE;
 		}
 
 		callsign = strdup(s);
 
-		if ((s = strtok(NULL, " \t\r\n")) == NULL) {
+		s = strtok(NULL, " \t\r\n");
+		if (s == NULL) {
 			fprintf(stderr, "nrattach: unable to parse line %d of the nrports file\n", n);
 			return FALSE;
 		}
 
-		if ((s = strtok(NULL, " \t\r\n")) == NULL) {
+		s = strtok(NULL, " \t\r\n");
+		if (s == NULL) {
 			fprintf(stderr, "nrattach: unable to parse line %d of the nrports file\n", n);
 			return FALSE;
 		}
 
 		if (mtu == 0) {
-			if ((mtu = atoi(s)) <= 0) {
+			mtu = atoi(s);
+			if (mtu <= 0) {
 				fprintf(stderr, "nrattach: invalid paclen setting\n");
 				return FALSE;
 			}
@@ -101,7 +108,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("nrattach: socket");
 		return FALSE;
 	}
@@ -132,7 +140,8 @@ static int startiface(char *dev, struct hostent *hp)
 	char call[7];
 	int fd;
 
-	if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+	fd = socket(AF_INET, SOCK_DGRAM, 0);
+	if (fd < 0) {
 		perror("nrattach: socket");
 		return FALSE;
 	}
@@ -203,13 +212,15 @@ 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, "nrattach: invalid internet name/address - %s\n", optarg);
 				return 1;
 			}
 			break;
 		case 'm':
-			if ((mtu = atoi(optarg)) <= 0) {
+			mtu = atoi(optarg);
+			if (mtu <= 0) {
 				fprintf(stderr, "nrattach: invalid mtu size - %s\n", optarg);
 				return 1;
 			}
diff --git a/netrom/nrparms.c b/netrom/nrparms.c
index 5583dd8..9c6a5d2 100644
--- a/netrom/nrparms.c
+++ b/netrom/nrparms.c
@@ -98,7 +98,8 @@ static void nodes(int s, char *nodecall, char *op, char *ident, int quality,
 		nr_node.ndigis++;
 	}
 
-	if ((dev = ax25_config_get_dev(port)) == NULL) {
+	dev = ax25_config_get_dev(port);
+	if (dev == NULL) {
 		fprintf(stderr, "nrparms: nodes: invalid port name - %s\n", port);
 		close(s);
 		exit(1);
@@ -162,7 +163,8 @@ static void routes(int s, char *port, char *nodecall, char *rest[])
 		exit(1);
 	}
 
-	if ((dev = ax25_config_get_dev(port)) == NULL) {
+	dev = ax25_config_get_dev(port);
+	if (dev == NULL) {
 		fprintf(stderr, "nrparms: routes: invalid port name - %s\n", port);
 		close(s);
 		exit(1);
@@ -207,7 +209,8 @@ int main(int argc, char *argv[])
 		return 0;
 	}
 
-	if ((s = socket(AF_NETROM, SOCK_SEQPACKET, 0)) < 0) {
+	s = socket(AF_NETROM, SOCK_SEQPACKET, 0);
+	if (s < 0) {
 		perror("nrparms: socket");
 		return 1;
 	}
diff --git a/netrom/nrsdrv.c b/netrom/nrsdrv.c
index 90b7635..a026cb8 100644
--- a/netrom/nrsdrv.c
+++ b/netrom/nrsdrv.c
@@ -321,7 +321,8 @@ int main(int argc, char *argv[])
 			logging = TRUE;
 			break;
 		case 's':
-			if ((speed = atoi(optarg)) <= 0) {
+			speed = atoi(optarg);
+			if (speed <= 0) {
 				fprintf(stderr, "nrsdrv: invalid speed %s\n", optarg);
 				return 1;
 			}
@@ -359,12 +360,14 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
-	if ((kissfd = open(kissdev, O_RDWR)) == -1) {
+	kissfd = open(kissdev, O_RDWR);
+	if (kissfd == -1) {
 		perror("nrsdrv: open kiss device");
 		return 1;
 	}
 
-	if ((nrsfd = open(nrsdev, O_RDWR)) == -1) {
+	nrsfd = open(nrsdev, O_RDWR);
+	if (nrsfd == -1) {
 		perror("nrsdrv: open nrs device");
 		return 1;
 	}
@@ -429,7 +432,8 @@ int main(int argc, char *argv[])
 		n = select(c, &read_fd, NULL, NULL, NULL);
 
 		if (FD_ISSET(kissfd, &read_fd)) {
-			if ((n = read(kissfd, buffer, 512)) <= 0) {
+			n = read(kissfd, buffer, 512);
+			if (n <= 0) {
 				if (logging) {
 					syslog(LOG_INFO, "terminating on KISS device closure\n");
 					closelog();
@@ -440,7 +444,8 @@ int main(int argc, char *argv[])
 		}
 
 		if (FD_ISSET(nrsfd, &read_fd)) {
-			if ((n = read(nrsfd, buffer, 512)) <= 0) {
+			n = read(nrsfd, buffer, 512);
+			if (n <= 0) {
 				if (logging) {
 					syslog(LOG_INFO, "terminating on NRS device closure\n");
 					closelog();
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;
 			}
diff --git a/tcpip/rip98d.c b/tcpip/rip98d.c
index 4b7be6b..c0543d0 100644
--- a/tcpip/rip98d.c
+++ b/tcpip/rip98d.c
@@ -180,7 +180,8 @@ static int read_routes(void)
 		first_route = NULL;
 	}
 
-	if ((fp = fopen(PROC_IP_ROUTE_FILE, "r")) == NULL) {
+	fp = fopen(PROC_IP_ROUTE_FILE, "r");
+	if (fp == NULL) {
 		if (logging)
 			syslog(LOG_ERR, "error cannot open %s\n", PROC_IP_ROUTE_FILE);
 		return FALSE;
@@ -213,7 +214,8 @@ static int read_routes(void)
 			}
 		}
 
-		if ((route = malloc(sizeof(struct route_struct))) == NULL) {
+		route = malloc(sizeof(struct route_struct));
+		if (route == NULL) {
 			if (logging)
 				syslog(LOG_ERR, "out of memory !\n");
 			return FALSE;
@@ -239,15 +241,18 @@ static int load_dests(void)
 	char buffer[255], *s;
 	FILE *fp;
 
-	if ((fp = fopen(CONF_RIP98D_FILE, "r")) == NULL) {
+	fp = fopen(CONF_RIP98D_FILE, "r");
+	if (fp == NULL) {
 		fprintf(stderr, "rip98d: cannot open config file\n");
 		return FALSE;
 	}
 
 	while (fgets(buffer, 255, fp) != NULL) {
-		if ((s = strchr(buffer, '\n')) != NULL) *s = '\0';
+		s = strchr(buffer, '\n');
+		if (s != NULL) *s = '\0';
 
-		if ((host = gethostbyname(buffer)) == NULL) {
+		host = gethostbyname(buffer);
+		if (host == NULL) {
 			fprintf(stderr, "rip98d: cannot resolve name %s\n", buffer);
 			fclose(fp);
 			return FALSE;
@@ -311,7 +316,8 @@ int main(int argc, char **argv)
 
 	signal(SIGTERM, terminate);
 
-	if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+	s = socket(AF_INET, SOCK_DGRAM, 0);
+	if (s < 0) {
 		perror("rip98d: socket");
 		return 1;
 	}
diff --git a/tcpip/rip98r.c b/tcpip/rip98r.c
index b1f283c..57afe4e 100644
--- a/tcpip/rip98r.c
+++ b/tcpip/rip98r.c
@@ -160,7 +160,8 @@ void receive_routes(int s)
 
 			case ADDITIONAL_ROUTE:
 				if (!found) {
-					if ((new = malloc(sizeof(struct route_struct))) == NULL) {
+					new = malloc(sizeof(struct route_struct));
+					if (new == NULL) {
 						if (logging)
 							syslog(LOG_ERR, "out of memory\n");
 						return;
@@ -186,7 +187,8 @@ void receive_routes(int s)
 		}
 
 		if (!matched) {
-			if ((new = malloc(sizeof(struct route_struct))) == NULL) {
+			new = malloc(sizeof(struct route_struct));
+			if (new == NULL) {
 				if (logging)
 					syslog(LOG_ERR, "out of memory\n");
 				return;
diff --git a/tcpip/ttylinkd.c b/tcpip/ttylinkd.c
index c11ffa6..200cfdd 100644
--- a/tcpip/ttylinkd.c
+++ b/tcpip/ttylinkd.c
@@ -238,7 +238,8 @@ int main(int argc, char *argv[])
 	/* Get the remote address, or use ours if remote isn't specified */
 	if (sysop_host)
 	{
-		if ((rhe = gethostbyname(sysop_host)) == NULL)
+		rhe = gethostbyname(sysop_host);
+		if (rhe == NULL)
 		{
 			syslog(LOG_DAEMON | LOG_CRIT, "main(): gethostbyname failed.");
 			exit(1);
@@ -246,7 +247,8 @@ int main(int argc, char *argv[])
 	}
 	else
 	{
-		if ((rhe = gethostbyname(hostname)) == NULL)
+		rhe = gethostbyname(hostname);
+		if (rhe == NULL)
 		{
 			syslog(LOG_DAEMON | LOG_CRIT, "main(): gethostbyname failed.");
 			exit(1);
@@ -255,7 +257,8 @@ int main(int argc, char *argv[])
 	memcpy((char*)&rem_addr, rhe->h_addr, rhe->h_length);
 
 	/* Get our local address */
-	if ((phe = gethostbyname(hostname)) == NULL)
+	phe = gethostbyname(hostname);
+	if (phe == NULL)
 	{
 		syslog(LOG_DAEMON | LOG_CRIT, "main(): gethostbyname failed.");
 		exit(1);
@@ -270,7 +273,8 @@ int main(int argc, char *argv[])
 	msg_sin->sin_port = htons(0);
 	memcpy((char*)&(msg_sin->sin_addr), phe->h_addr, phe->h_length);
 
-	if ((skt = socket(PF_INET, SOCK_STREAM, 0)) < 0)
+	skt = socket(PF_INET, SOCK_STREAM, 0);
+	if (skt < 0)
 	{
 		syslog(LOG_DAEMON | LOG_CRIT, "main(): socket() failed.");
 		exit(1);
@@ -296,7 +300,8 @@ int main(int argc, char *argv[])
 	memcpy((char*)&ctl_sin.sin_addr, phe->h_addr, phe->h_length);
 	ctl_sin.sin_port = htons(0);
 
-	if ((ctl_skt = socket(PF_INET, SOCK_DGRAM, 0)) < 0)
+	ctl_skt = socket(PF_INET, SOCK_DGRAM, 0);
+	if (ctl_skt < 0)
 	{
 		syslog(LOG_DAEMON | LOG_CRIT, "main(): socket() while attempting to create control socket.");
 		close(skt);
@@ -383,7 +388,8 @@ int main(int argc, char *argv[])
 	signal(SIGALRM, alarm_handle);
 	alarm(30);
 
-	if ((new_skt = accept(skt, NULL, NULL)) < 0)
+	new_skt = accept(skt, NULL, NULL);
+	if (new_skt < 0)
 	{
 		if (errno == EINTR)
 		{
@@ -659,7 +665,8 @@ static void do_talk(int skt)
 
 		if (FD_ISSET(skt, &fdvar))
 		{
-			if ((i = read(skt, inbuf, 256)) <= 0)
+			i = read(skt, inbuf, 256);
+			if (i <= 0)
 			{
 				strcpy(inbuf,"Sysop closed connection.\n");
 				write(STDOUT_FILENO, inbuf, strlen(inbuf));
@@ -674,7 +681,8 @@ static void do_talk(int skt)
 		}
 		if (FD_ISSET(STDIN_FILENO, &fdvar))
 		{
-			if ((i = read(STDIN_FILENO, outbuf, 256)) <= 0)
+			i = read(STDIN_FILENO, outbuf, 256);
+			if (i <= 0)
 			{
 				strcpy(outbuf, "User closed connection.\n");
 				(void) write(skt, outbuf, strlen(outbuf));
@@ -704,7 +712,8 @@ static void read_config_file(int dummy)
 	char param[20], value[108];
 	FILE *fp;
 
-	if ( (fp = fopen(config_file, "r")) == NULL) {
+	fp = fopen(config_file, "r");
+	if (fp == NULL) {
 		syslog(LOG_DAEMON | LOG_ERR, "Cannot find configuration file: %s (%m)\n",config_file);
 		return;
 	}
diff --git a/user_call/ax25_call.c b/user_call/ax25_call.c
index cbfc6cb..d818bbf 100644
--- a/user_call/ax25_call.c
+++ b/user_call/ax25_call.c
@@ -72,7 +72,8 @@ int main(int argc, char **argv)
 	axconnect.fsa_ax25.sax25_family = axbind.fsa_ax25.sax25_family = AF_AX25;
 	axbind.fsa_ax25.sax25_ndigis = 1;
 
-	if ((addr = ax25_config_get_addr(argv[optind])) == NULL) {
+	addr = ax25_config_get_addr(argv[optind]);
+	if (addr == NULL) {
 		sprintf(buffer, "ERROR: invalid AX.25 port name - %s\r", argv[optind]);
 		err(buffer);
 	}
@@ -95,7 +96,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) {
 		sprintf(buffer, "ERROR: cannot open AX.25 socket, %s\r", strerror(errno));
 		err(buffer);
 	}
diff --git a/user_call/netrom_call.c b/user_call/netrom_call.c
index e3f9995..2ba553b 100644
--- a/user_call/netrom_call.c
+++ b/user_call/netrom_call.c
@@ -78,7 +78,8 @@ int main(int argc, char **argv)
 	nrbind.fsa_ax25.sax25_ndigis    = 1;
 	nrconnect.fsa_ax25.sax25_ndigis = 0;
 
-	if ((addr = nr_config_get_addr(argv[optind])) == NULL) {
+	addr = nr_config_get_addr(argv[optind]);
+	if (addr == NULL) {
 		sprintf(buffer, "ERROR: invalid NET/ROM port name - %s\r", argv[optind]);
 		err(buffer);
 	}
@@ -106,7 +107,8 @@ int main(int argc, char **argv)
 	/*
 	 * Open the socket into the kernel.
 	 */
-	if ((s = socket(AF_NETROM, SOCK_SEQPACKET, 0)) < 0) {
+	s = socket(AF_NETROM, SOCK_SEQPACKET, 0);
+	if (s < 0) {
 		sprintf(buffer, "ERROR: cannot open NET/ROM socket, %s\r", strerror(errno));
 		err(buffer);
 	}
diff --git a/user_call/rose_call.c b/user_call/rose_call.c
index 166307f..7a7dea1 100644
--- a/user_call/rose_call.c
+++ b/user_call/rose_call.c
@@ -73,7 +73,8 @@ int main(int argc, char **argv)
 	roseconnect.srose_family = rosebind.srose_family = AF_ROSE;
 	roseconnect.srose_ndigis = rosebind.srose_ndigis = 0;
 
-	if ((addr = rs_config_get_addr(argv[optind])) == NULL) {
+	addr = rs_config_get_addr(argv[optind]);
+	if (addr == NULL) {
 		sprintf(buffer, "ERROR: invalid Rose port name - %s\r", argv[optind]);
 		err(buffer);
 	}
@@ -101,7 +102,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) {
 		sprintf(buffer, "ERROR: cannot open Rose socket, %s\r", strerror(errno));
 		err(buffer);
 	}
diff --git a/user_call/tcp_call.c b/user_call/tcp_call.c
index 581cd40..204638b 100644
--- a/user_call/tcp_call.c
+++ b/user_call/tcp_call.c
@@ -69,7 +69,8 @@ int main(int argc, char **argv)
 	/*
 	 * Open the socket into the kernel.
 	 */
-	if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
+	s = socket(AF_INET, SOCK_STREAM, 0);
+	if (s < 0) {
 		sprintf(buffer, "ERROR: can't open socket: %s\n", strerror(errno));
 		err(buffer);
 	}
diff --git a/user_call/user_io.c b/user_call/user_io.c
index 3c7e9d5..3bd6a26 100644
--- a/user_call/user_io.c
+++ b/user_call/user_io.c
@@ -163,7 +163,8 @@ int user_read(int fd, void *buf, size_t count)
 		incoming_stream.next_in = input_buffer;
 		incoming_stream.avail_in = 0;
 
-		if ((len = read(fd, input_buffer, BUFLEN)) <= 0)
+		len = read(fd, input_buffer, BUFLEN);
+		if (len <= 0)
 			return len;
 
 		incoming_stream.avail_in = len;
diff --git a/yamdrv/yamcfg.c b/yamdrv/yamcfg.c
index b14d6ff..7efb55a 100644
--- a/yamdrv/yamcfg.c
+++ b/yamdrv/yamcfg.c
@@ -320,7 +320,8 @@ int main (int argc, char *argv[])
 
 	strcpy (name, argv[1]);
 
-	if ((sock = socket (PF_INET, SOCK_PACKET, htons (ETH_P_AX25))) < 0)
+	sock = socket(PF_INET, SOCK_PACKET, htons(ETH_P_AX25));
+	if (sock < 0)
 	{
 		fprintf (stderr, "%s: Error %s (%i), cannot open %s\n",
 				 argv[0], strerror (errno), errno, name);