Fix warnings in preparation for adding -Wall -Wcast-qual to the

        kernel compile

2 files changed, 10 insertions, 10 deletions

diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.c b/sys/contrib/ipfilter/netinet/ip_proxy.c
index fe18abb..3176429 100644
--- a/sys/contrib/ipfilter/netinet/ip_proxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_proxy.c
@@ -6,7 +6,7 @@
  * to the original author and the contributors.
  */
 #if !defined(lint)
-static const char rcsid[] = "@(#)$Id: ip_proxy.c,v 1.2 1998/03/21 11:34:23 peter Exp $";
+static const char rcsid[] = "@(#)$Id: ip_proxy.c,v 1.3 1998/06/20 18:37:50 peter Exp $";
 #endif
 
 #if defined(__FreeBSD__) && defined(KERNEL) && !defined(_KERNEL)
@@ -127,13 +127,13 @@ u_short sport, dport;
 {
 	if (aps->aps_dst.s_addr == dst.s_addr) {
 		if ((aps->aps_src.s_addr == src.s_addr) &&
-		    (!tcp || (sport == aps->aps_sport) &&
-		     (dport == aps->aps_dport)))
+		    (!tcp || ((sport == aps->aps_sport) &&
+		     (dport == aps->aps_dport))))
 			return 1;
 	} else if (aps->aps_dst.s_addr == src.s_addr) {
 		if ((aps->aps_src.s_addr == dst.s_addr) &&
-		    (!tcp || (sport == aps->aps_dport) &&
-		     (dport == aps->aps_sport)))
+		    (!tcp || ((sport == aps->aps_dport) &&
+		     (dport == aps->aps_sport))))
 			return 1;
 	}
 	return 0;
diff --git a/sys/contrib/ipfilter/netinet/ip_state.c b/sys/contrib/ipfilter/netinet/ip_state.c
index 5545b3d..b6a8054 100644
--- a/sys/contrib/ipfilter/netinet/ip_state.c
+++ b/sys/contrib/ipfilter/netinet/ip_state.c
@@ -7,7 +7,7 @@
  */
 #if !defined(lint)
 static const char sccsid[] = "@(#)ip_state.c	1.8 6/5/96 (C) 1993-1995 Darren Reed";
-static const char rcsid[] = "@(#)$Id: ip_state.c,v 1.3 1998/06/20 18:37:51 peter Exp $";
+static const char rcsid[] = "@(#)$Id: ip_state.c,v 1.4 1998/11/26 18:54:52 eivind Exp $";
 #endif
 
 #include "opt_ipfilter.h"
@@ -478,8 +478,8 @@ u_short sp, dp;
 		     (!out && is->is_ifpin == ifp)) &&
 		    (is->is_dst.s_addr == dst.s_addr) &&
 		    (is->is_src.s_addr == src.s_addr) &&
-		    (!tcp || (sp == is->is_sport) &&
-		     (dp == is->is_dport))) {
+		    (!tcp || ((sp == is->is_sport) &&
+		     (dp == is->is_dport)))) {
 			ret = 1;
 		}
 	} else {
@@ -487,8 +487,8 @@ u_short sp, dp;
 		     (!out && is->is_ifpout == ifp)) &&
 		    (is->is_dst.s_addr == src.s_addr) &&
 		    (is->is_src.s_addr == dst.s_addr) &&
-		    (!tcp || (sp == is->is_dport) &&
-		     (dp == is->is_sport))) {
+		    (!tcp || ((sp == is->is_dport) &&
+		     (dp == is->is_sport)))) {
 			ret = 1;
 		}
 	}