From ff0f694d466fb114c185bf464811658f97d012f1 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 20 Aug 1998 21:47:37 +0000
Subject: Fixed many warnings.

---
 c/src/exec/libnetworking/net/if_ethersubr.c | 15 +++++++++++----
 c/src/exec/libnetworking/net/route.c        |  2 +-
 c/src/exec/libnetworking/net/rtsock.c       |  4 ++--
 3 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'c/src/exec/libnetworking/net')

diff --git a/c/src/exec/libnetworking/net/if_ethersubr.c b/c/src/exec/libnetworking/net/if_ethersubr.c
index 9ff1a5932a..4d1675ca3c 100644
--- a/c/src/exec/libnetworking/net/if_ethersubr.c
+++ b/c/src/exec/libnetworking/net/if_ethersubr.c
@@ -120,14 +120,18 @@ ether_output(ifp, m0, dst, rt0)
 {
 	short type;
 	int s, error = 0;
- 	u_char *cp, edst[6];
-	register struct mbuf *m2, *m = m0;
+#ifdef NS
+ 	u_char *cp
+	register struct ifqueue *inq;
+	register struct mbuf *m2;
+#endif
+	u_char  edst[6];
+	register struct mbuf *m = m0;
 	register struct rtentry *rt;
 	struct mbuf *mcopy = (struct mbuf *)0;
 	register struct ether_header *eh;
 	int off, len = m->m_pkthdr.len;
 	struct arpcom *ac = (struct arpcom *)ifp;
-	register struct ifqueue *inq;
 #ifdef NETATALK
 	struct at_ifaddr *aa;
 #endif NETATALK
@@ -457,7 +461,10 @@ ether_input(ifp, eh, m)
 	struct mbuf *m;
 {
 	register struct ifqueue *inq;
-	u_short ether_type, *checksum;
+	u_short ether_type;
+#ifdef NS
+	u_short *checksum;
+#endif
 	int s;
 #if defined (ISO) || defined (LLC) || defined(NETATALK)
 	register struct llc *l;
diff --git a/c/src/exec/libnetworking/net/route.c b/c/src/exec/libnetworking/net/route.c
index 0bea64f747..683ddafee9 100644
--- a/c/src/exec/libnetworking/net/route.c
+++ b/c/src/exec/libnetworking/net/route.c
@@ -517,7 +517,7 @@ rtrequest(req, dst, gateway, netmask, flags, ret_nrt)
 			senderr(ENOBUFS);
 		Bzero(rt, sizeof(*rt));
 		rt->rt_flags = RTF_UP | flags;
-		if (error = rt_setgate(rt, dst, gateway)) {
+		if ((error = rt_setgate(rt, dst, gateway))) {
 			Free(rt);
 			senderr(error);
 		}
diff --git a/c/src/exec/libnetworking/net/rtsock.c b/c/src/exec/libnetworking/net/rtsock.c
index 2a08181000..57e777906a 100644
--- a/c/src/exec/libnetworking/net/rtsock.c
+++ b/c/src/exec/libnetworking/net/rtsock.c
@@ -225,8 +225,8 @@ route_output(m, so)
 	case RTM_LOCK:
 		if ((rnh = rt_tables[dst->sa_family]) == 0) {
 			senderr(EAFNOSUPPORT);
-		} else if (rt = (struct rtentry *)
-				rnh->rnh_lookup(dst, netmask, rnh))
+		} else if ((rt = (struct rtentry *)
+				rnh->rnh_lookup(dst, netmask, rnh)))
 			rt->rt_refcnt++;
 		else
 			senderr(ESRCH);
-- 
cgit v1.2.3