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

        kernel compile

5 files changed, 20 insertions, 18 deletions

diff --git a/sys/netatm/spans/spans_arp.c b/sys/netatm/spans/spans_arp.c
index d2d65e6..b291e55 100644
--- a/sys/netatm/spans/spans_arp.c
+++ b/sys/netatm/spans/spans_arp.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_arp.c,v 1.3 1998/12/04 22:54:53 archie Exp $
+ *	@(#) $Id: spans_arp.c,v 1.4 1999/01/19 23:11:40 mks Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/spans/spans_cls.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_arp.c,v 1.3 1998/12/04 22:54:53 archie Exp $");
+__RCSID("@(#) $Id: spans_arp.c,v 1.4 1999/01/19 23:11:40 mks Exp $");
 #endif
 
 
@@ -1108,8 +1108,8 @@ spansarp_ioctl(code, data, arg1)
 				/*
 				 * Copy the response into the user's buffer
 				 */
-				if (err = copyout((caddr_t)&aar, buf_addr, 
-							sizeof(aar)))
+				if ((err = copyout((caddr_t)&aar, buf_addr, 
+							sizeof(aar))) != 0)
 					break;
 				buf_addr += sizeof(aar);
 				buf_len -= sizeof(aar);
diff --git a/sys/netatm/spans/spans_cls.c b/sys/netatm/spans/spans_cls.c
index 17dc135..24dd44f 100644
--- a/sys/netatm/spans/spans_cls.c
+++ b/sys/netatm/spans/spans_cls.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_cls.c,v 1.2 1998/10/31 20:06:56 phk Exp $
+ *	@(#) $Id: spans_cls.c,v 1.3 1998/12/04 22:54:53 archie Exp $
  *
  */
 
@@ -44,7 +44,7 @@
 #include <netatm/spans/spans_cls.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_cls.c,v 1.2 1998/10/31 20:06:56 phk Exp $");
+__RCSID("@(#) $Id: spans_cls.c,v 1.3 1998/12/04 22:54:53 archie Exp $");
 #endif
 
 
@@ -703,7 +703,7 @@ spanscls_cpcs_data(tok, m)
 		/*
 		 * Packet is ready for input to IP
 		 */
-		if (inp = clp->cls_ipnif)
+		if ((inp = clp->cls_ipnif) != NULL)
 			(void) (*inp->inf_ipinput)(inp, m);
 		else
 			KB_FREEALL(m);
diff --git a/sys/netatm/spans/spans_if.c b/sys/netatm/spans/spans_if.c
index 4557f26..12c9a16 100644
--- a/sys/netatm/spans/spans_if.c
+++ b/sys/netatm/spans/spans_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_if.c,v 1.3 1998/10/31 20:06:56 phk Exp $
+ *	@(#) $Id: spans_if.c,v 1.4 1998/12/04 22:54:53 archie Exp $
  *
  */
 
@@ -46,7 +46,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_if.c,v 1.3 1998/10/31 20:06:56 phk Exp $");
+__RCSID("@(#) $Id: spans_if.c,v 1.4 1998/12/04 22:54:53 archie Exp $");
 #endif
 
 /*
@@ -428,7 +428,7 @@ spans_detach(pip)
 	/*
 	 * Now close the SPANS signalling VCC
 	 */
-	if (cop = spp->sp_conn) {
+	if ((cop = spp->sp_conn) != NULL) {
 		err = atm_cm_release(cop, &spans_cause);
 		if (err)
 			ATM_DEBUG2(
@@ -727,7 +727,7 @@ spans_reject(vcp, errp)
 	 * Clean up the VCCB--the connection manager will free it
 	 * spans_close_vcc will send a SPANS open response
 	 */
-	if (*errp = spans_close_vcc(spp, svp, TRUE)) {
+	if ((*errp = spans_close_vcc(spp, svp, TRUE)) != 0) {
 		ATM_DEBUG0("spans_reject: spans_close_vcc failed\n");
 		return(CALL_FAILED);
 	}
@@ -1018,8 +1018,8 @@ spans_ioctl(code, data, arg1)
 			/*
 			 * Copy the response into the user's buffer
 			 */
-			if (err = copyout((caddr_t)&rsp, buf_addr,
-					sizeof(rsp)))
+			if ((err = copyout((caddr_t)&rsp, buf_addr,
+					sizeof(rsp))) != 0)
 				break;
 			buf_addr += sizeof(rsp);
 			buf_len -= sizeof(rsp);
diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c
index f04cc7f..486da9a 100644
--- a/sys/netatm/spans/spans_msg.c
+++ b/sys/netatm/spans/spans_msg.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_msg.c,v 1.2 1998/09/17 09:35:00 phk Exp $
+ *	@(#) $Id: spans_msg.c,v 1.3 1998/10/31 20:06:56 phk Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_msg.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+__RCSID("@(#) $Id: spans_msg.c,v 1.3 1998/10/31 20:06:56 phk Exp $");
 #endif
 
 /*
@@ -545,7 +545,7 @@ spans_open_req(spp, msg)
 	/*
 	 * See if the connection is new
 	 */
-	if (svp = spans_find_conn(spp, &msg->sm_open_req.opreq_conn)) {
+	if ((svp = spans_find_conn(spp, &msg->sm_open_req.opreq_conn)) != NULL) {
 		/*
 		 * We already have a VCCB that matches the connection in
 		 * the request
diff --git a/sys/netatm/spans/spans_print.c b/sys/netatm/spans/spans_print.c
index 99e8c94..4068be9 100644
--- a/sys/netatm/spans/spans_print.c
+++ b/sys/netatm/spans/spans_print.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_print.c,v 1.3 1998/10/31 20:06:56 phk Exp $
+ *	@(#) $Id: spans_print.c,v 1.4 1998/12/04 22:54:53 archie Exp $
  *
  */
 
@@ -41,7 +41,7 @@
 #include <netatm/spans/spans_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: spans_print.c,v 1.3 1998/10/31 20:06:56 phk Exp $");
+__RCSID("@(#) $Id: spans_print.c,v 1.4 1998/12/04 22:54:53 archie Exp $");
 #endif
 
 /*
@@ -1067,6 +1067,8 @@ spans_print_msgbody(objp)
 				rccnf_p->rccnf_conn.con_dsap,
 				rccnf_p->rccnf_conn.con_ssap);
 		break;
+	default:
+		break;
 	}
 	printf("\n");
 }