From 73556bfee1b1d6dfc2a2f5d400228ca90bb34fc9 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Thu, 6 May 1999 18:13:11 +0000
Subject: Add sufficient braces to keep egcs happy about potentially ambiguous
 if/else nesting.

---
 sys/net/if_tun.c |  4 ++--
 sys/net/if_var.h | 12 +++++++-----
 sys/net/route.h  | 12 +++++++-----
 3 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'sys/net')

diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 92c156d..181fa86 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -657,7 +657,7 @@ tunpoll(dev, events, p)
 	s = splimp();
 	TUNDEBUG("%s%d: tunpoll\n", ifp->if_name, ifp->if_unit);
 
-	if (events & (POLLIN | POLLRDNORM))
+	if (events & (POLLIN | POLLRDNORM)) {
 		if (ifp->if_snd.ifq_len > 0) {
 			TUNDEBUG("%s%d: tunpoll q=%d\n", ifp->if_name,
 			    ifp->if_unit, ifp->if_snd.ifq_len);
@@ -667,7 +667,7 @@ tunpoll(dev, events, p)
 			    ifp->if_unit);
 			selrecord(p, &tp->tun_rsel);
 		}
-
+	}
 	if (events & (POLLOUT | POLLWRNORM))
 		revents |= events & (POLLOUT | POLLWRNORM);
 
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index d66aeb7..d8da636 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)if.h	8.1 (Berkeley) 6/10/93
- *	$Id: if_var.h,v 1.10 1998/12/16 18:30:43 phk Exp $
+ *	$Id: if_var.h,v 1.11 1999/04/16 21:22:46 peter Exp $
  */
 
 #ifndef	_NET_IF_VAR_H_
@@ -277,10 +277,12 @@ struct ifmultiaddr {
 
 #ifdef KERNEL
 #define	IFAFREE(ifa) \
-	if ((ifa)->ifa_refcnt <= 0) \
-		ifafree(ifa); \
-	else \
-		(ifa)->ifa_refcnt--;
+	do { \
+		if ((ifa)->ifa_refcnt <= 0) \
+			ifafree(ifa); \
+		else \
+			(ifa)->ifa_refcnt--; \
+	} while (0)
 
 extern	struct ifnethead ifnet;
 extern	int ifqmaxlen;
diff --git a/sys/net/route.h b/sys/net/route.h
index 850d38e..f53e4e5 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)route.h	8.3 (Berkeley) 4/19/94
- * $Id: route.h,v 1.27 1997/09/07 05:26:27 bde Exp $
+ * $Id: route.h,v 1.28 1998/03/23 13:58:02 bde Exp $
  */
 
 #ifndef _NET_ROUTE_H_
@@ -255,10 +255,12 @@ struct route_cb {
 
 #ifdef KERNEL
 #define	RTFREE(rt) \
-	if ((rt)->rt_refcnt <= 1) \
-		rtfree(rt); \
-	else \
-		(rt)->rt_refcnt--;
+	do { \
+		if ((rt)->rt_refcnt <= 1) \
+			rtfree(rt); \
+		else \
+			(rt)->rt_refcnt--; \
+	} while (0)
 
 extern struct route_cb route_cb;
 extern struct radix_node_head *rt_tables[AF_MAX+1];
-- 
cgit v1.1