Add sufficient braces to keep egcs happy about potentially ambiguous

if/else nesting.

4 files changed, 14 insertions, 10 deletions

diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 4dd80e9..9b7e415 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ether.c	8.1 (Berkeley) 6/10/93
- * $Id: if_ether.c,v 1.56 1999/03/10 10:11:43 julian Exp $
+ * $Id: if_ether.c,v 1.57 1999/04/15 17:58:24 eivind Exp $
  */
 
 /*
@@ -544,7 +544,7 @@ in_arpinput(m)
 		}
 #endif
 		if (sdl->sdl_alen &&
-		    bcmp((caddr_t)ea->arp_sha, LLADDR(sdl), sdl->sdl_alen))
+		    bcmp((caddr_t)ea->arp_sha, LLADDR(sdl), sdl->sdl_alen)) {
 			if (rt->rt_expire)
 			    log(LOG_INFO, "arp: %s moved from %6D to %6D on %s%d\n",
 				inet_ntoa(isaddr), (u_char *)LLADDR(sdl), ":",
@@ -557,6 +557,7 @@ in_arpinput(m)
 				ac->ac_if.if_name, ac->ac_if.if_unit);
 			    goto reply;
 			}
+		}
 		(void)memcpy(LLADDR(sdl), ea->arp_sha, sizeof(ea->arp_sha));
 		sdl->sdl_alen = sizeof(ea->arp_sha);
                 sdl->sdl_rcf = NULL;
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 65bfecf..bf63c76 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -9,7 +9,7 @@
  * Modified by Bill Fenner, PARC, April 1995
  *
  * MROUTING Revision: 3.5
- * $Id: ip_mroute.c,v 1.52 1999/01/12 12:16:50 eivind Exp $
+ * $Id: ip_mroute.c,v 1.53 1999/01/18 02:06:57 fenner Exp $
  */
 
 #include "opt_mrouting.h"
@@ -2195,13 +2195,14 @@ rsvp_input(m, iphlen)
 	printf("rsvp_input: m->m_len = %d, sbspace() = %ld\n",
 	       m->m_len,sbspace(&(viftable[vifi].v_rsvpd->so_rcv)));
 
-    if (socket_send(viftable[vifi].v_rsvpd, m, &rsvp_src) < 0)
+    if (socket_send(viftable[vifi].v_rsvpd, m, &rsvp_src) < 0) {
 	if (rsvpdebug)
 	    printf("rsvp_input: Failed to append to socket\n");
-    else
+    } else {
 	if (rsvpdebug)
 	    printf("rsvp_input: send packet up\n");
-    
+    }
+
     splx(s);
 }
 
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index b155c1d..9709d50 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id: tcp_input.c,v 1.84 1999/02/06 00:47:45 fenner Exp $
+ *	$Id: tcp_input.c,v 1.85 1999/05/03 23:57:30 billf Exp $
  */
 
 #include "opt_ipfw.h"		/* for ipfw_fwd		*/
@@ -844,11 +844,12 @@ findpcb:
 			 * we don't get fooled into using T/TCP.
 			 */
 			if (to.to_flag & TOF_CCECHO) {
-				if (tp->cc_send != to.to_ccecho)
+				if (tp->cc_send != to.to_ccecho) {
 					if (taop->tao_ccsent != 0)
 						goto drop;
 					else
 						goto dropwithreset;
+				}
 			} else
 				tp->t_flags &= ~TF_RCVD_CC;
 			tcpstat.tcps_connects++;
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index b155c1d..9709d50 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tcp_input.c	8.12 (Berkeley) 5/24/95
- *	$Id: tcp_input.c,v 1.84 1999/02/06 00:47:45 fenner Exp $
+ *	$Id: tcp_input.c,v 1.85 1999/05/03 23:57:30 billf Exp $
  */
 
 #include "opt_ipfw.h"		/* for ipfw_fwd		*/
@@ -844,11 +844,12 @@ findpcb:
 			 * we don't get fooled into using T/TCP.
 			 */
 			if (to.to_flag & TOF_CCECHO) {
-				if (tp->cc_send != to.to_ccecho)
+				if (tp->cc_send != to.to_ccecho) {
 					if (taop->tao_ccsent != 0)
 						goto drop;
 					else
 						goto dropwithreset;
+				}
 			} else
 				tp->t_flags &= ~TF_RCVD_CC;
 			tcpstat.tcps_connects++;