-Wall happieness. bug fix caused by parens...

4 files changed, 11 insertions, 16 deletions

diff --git a/sys/netipx/ipx.c b/sys/netipx/ipx.c
index 46fa58d7cf8..f126c5a2ed7 100644
--- a/sys/netipx/ipx.c
+++ b/sys/netipx/ipx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipx.c,v 1.1 1996/08/16 09:15:57 mickey Exp $	*/
+/*	$OpenBSD: ipx.c,v 1.2 1996/10/18 14:28:21 mickey Exp $	*/
 /*	$NOWHERE: ipx.c,v 1.2 1996/05/07 09:49:37 mickey Exp $	*/
 
 /*-
@@ -73,7 +73,6 @@ ipx_control(so, cmd, data, ifp)
 	register struct ifreq *ifr = (struct ifreq *)data;
 	register struct ipx_aliasreq *ifra = (struct ipx_aliasreq *)data;
 	register struct ipx_ifaddr *ia;
-	struct ifaddr *ifa;
 	int dstIsNew, hostIsNew;
 	int error = 0;
 
diff --git a/sys/netipx/ipx_input.c b/sys/netipx/ipx_input.c
index 9c59e553f59..79a4c8c0a2a 100644
--- a/sys/netipx/ipx_input.c
+++ b/sys/netipx/ipx_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipx_input.c,v 1.1 1996/08/16 09:15:59 mickey Exp $	*/
+/*	$OpenBSD: ipx_input.c,v 1.2 1996/10/18 14:28:22 mickey Exp $	*/
 /*	$NOWHERE: ipx_input.c,v 1.2 1996/05/07 09:49:42 mickey Exp $	*/
 
 /*-
@@ -190,7 +190,7 @@ next:
 
 	ipx = mtod(m, struct ipx *);
 	len = ntohs(ipx->ipx_len);
-	if (oddpacketp = len & 1) {
+	if (oddpacketp == (len & 1)) {
 		len++;		/* If this packet is of odd length,
 				   preserve garbage byte for checksum */
 	}
@@ -331,9 +331,9 @@ ipx_ctlinput(cmd, arg_as_sa, dummy)
 	int type;
 
 	if (cmd < 0 || cmd > PRC_NCMDS)
-		return;
+		return NULL;
 	if (ipxctlerrmap[cmd] == 0)
-		return;		/* XXX */
+		return NULL;		/* XXX */
 	type = IPX_ERR_UNREACH_HOST;
 	errp = (struct ipx_errp *)arg;
 	switch (cmd) {
@@ -344,7 +344,7 @@ ipx_ctlinput(cmd, arg_as_sa, dummy)
 	case PRC_HOSTUNREACH:
 		sipx = (struct sockaddr_ipx *)arg;
 		if (sipx->sipx_family != AF_IPX)
-			return;
+			return NULL;
 		ipx = &sipx->sipx_addr;
 		break;
 
diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c
index 7788f2a405e..8364aeefcf1 100644
--- a/sys/netipx/ipx_ip.c
+++ b/sys/netipx/ipx_ip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipx_ip.c,v 1.1 1996/08/16 09:16:00 mickey Exp $	*/
+/*	$OpenBSD: ipx_ip.c,v 1.2 1996/10/18 14:28:22 mickey Exp $	*/
 /*	$NOWHERE: ipx_ip.c,v 1.2 1996/05/07 09:49:43 mickey Exp $	*/
 
 /*-
@@ -232,7 +232,6 @@ ipxip_input( struct mbuf *m, ...)
 	s = splimp();
 	if (IF_QFULL(ifq)) {
 		IF_DROP(ifq);
-bad:
 		m_freem(m);
 		splx(s);
 		return;
@@ -306,9 +305,6 @@ ipxipoutput(ifp, m, dst, rt)
 		ifn->ifen_ifnet.if_ierrors = error;
 	}
 	return (error);
-bad:
-	m_freem(m);
-	return (ENETUNREACH);
 }
 
 void
diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c
index 8fc3aa5f031..36cce174298 100644
--- a/sys/netipx/spx_usrreq.c
+++ b/sys/netipx/spx_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spx_usrreq.c,v 1.1 1996/08/16 09:16:04 mickey Exp $	*/
+/*	$OpenBSD: spx_usrreq.c,v 1.2 1996/10/18 14:28:23 mickey Exp $	*/
 /*	$NOWHERE: spx_usrreq.c,v 1.2 1996/05/07 09:49:55 mickey Exp $	*/
 
 /*-
@@ -439,9 +439,9 @@ register struct spx *si;
 update_window:
 	if (SSEQ_LT(cb->s_snxt, cb->s_rack))
 		cb->s_snxt = cb->s_rack;
-	if (SSEQ_LT(cb->s_swl1, si->si_seq) || cb->s_swl1 == si->si_seq &&
-	    (SSEQ_LT(cb->s_swl2, si->si_ack) ||
-	     cb->s_swl2 == si->si_ack && SSEQ_LT(cb->s_ralo, si->si_alo))) {
+	if ((SSEQ_LT(cb->s_swl1, si->si_seq) || cb->s_swl1 == si->si_seq) &&
+	     (SSEQ_LT(cb->s_swl2, si->si_ack) || cb->s_swl2 == si->si_ack) &&
+	     SSEQ_LT(cb->s_ralo, si->si_alo)) {
 		/* keep track of pure window updates */
 		if ((si->si_cc & SPX_SP) && cb->s_swl2 == si->si_ack
 		    && SSEQ_LT(cb->s_ralo, si->si_alo)) {