From b4e36adf1cde894f213665ef59f7fc43ff38ab14 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@FreeBSD.org>
Date: Wed, 27 Jan 1999 20:09:21 +0000
Subject:     Fix warnings preparing for -Wall -Wcast-qual

    Also disable one usb module in LINT due to fatal compilation errors,
    temporary.
---
 sys/dev/hea/eni_if.c       | 11 +++++------
 sys/dev/hea/eni_receive.c  |  8 ++++----
 sys/dev/hea/eni_transmit.c |  8 ++++----
 3 files changed, 13 insertions(+), 14 deletions(-)

(limited to 'sys/dev/hea')

diff --git a/sys/dev/hea/eni_if.c b/sys/dev/hea/eni_if.c
index 49f5e09516cdc..00f92337a2213 100644
--- a/sys/dev/hea/eni_if.c
+++ b/sys/dev/hea/eni_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: eni_if.c,v 1.2 1998/10/31 20:06:45 phk Exp $
+ *	@(#) $Id: eni_if.c,v 1.3 1998/12/04 22:54:45 archie Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_if.c,v 1.2 1998/10/31 20:06:45 phk Exp $");
+__RCSID("@(#) $Id: eni_if.c,v 1.3 1998/12/04 22:54:45 archie Exp $");
 #endif
 
 static void	eni_get_stats __P((Eni_unit *));
@@ -216,7 +216,7 @@ eni_atm_ioctl ( code, data, arg )
 		/*
 		 * Copy interface name into response structure
 		 */
-		if ( err = copyout ( ifname, avr->avsp_intf, IFNAMSIZ ) )
+		if ((err = copyout(ifname, avr->avsp_intf, IFNAMSIZ)) != 0)
 			break;
 
 		/*
@@ -239,8 +239,7 @@ eni_atm_ioctl ( code, data, arg )
 		 * Copy stats into user's buffer. Return value is
 		 * amount of data copied.
 		 */
-		if ( err = copyout ((void *)&eup->eu_stats, buf,
-			count))
+		if ((err = copyout((void *)&eup->eu_stats, buf, count)) != 0)
 				break;
 		buf += count;
 		buf_len -= count;
@@ -250,7 +249,7 @@ eni_atm_ioctl ( code, data, arg )
 		/*
 		 * Record amount we're returning as vendor info...
 		 */
-		if (err = copyout(&count, &avr->avsp_len, sizeof(int)))
+		if ((err = copyout(&count, &avr->avsp_len, sizeof(int))) != 0)
 			break;
 
 		/*
diff --git a/sys/dev/hea/eni_receive.c b/sys/dev/hea/eni_receive.c
index 8e8be36d6577b..883602bb065a4 100644
--- a/sys/dev/hea/eni_receive.c
+++ b/sys/dev/hea/eni_receive.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_receive.c,v 1.2 1998/09/17 09:34:58 phk Exp $
+ *	@(#) $Id: eni_receive.c,v 1.3 1998/10/31 20:06:45 phk Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_receive.c,v 1.2 1998/09/17 09:34:58 phk Exp $");
+__RCSID("@(#) $Id: eni_receive.c,v 1.3 1998/10/31 20:06:45 phk Exp $");
 #endif
 
 static void	eni_recv_stack __P((void *, KBuffer *));
@@ -114,8 +114,8 @@ eni_do_service ( eup )
 		 * VCC into TRASH mode.
 		 */
 		if ( ( vci_hdr & VCI_IN_SERVICE ) == 0 ||
-		    ( vci_hdr & ~VCI_MODE_MASK ==
-			VCI_MODE_TRASH << VCI_MODE_SHIFT ) )
+		    ( (vci_hdr & ~VCI_MODE_MASK) ==
+			(VCI_MODE_TRASH << VCI_MODE_SHIFT) ) )
 			    goto next_vcc;
 
 		/*
diff --git a/sys/dev/hea/eni_transmit.c b/sys/dev/hea/eni_transmit.c
index 2721709a8fd6a..f44ec41223e45 100644
--- a/sys/dev/hea/eni_transmit.c
+++ b/sys/dev/hea/eni_transmit.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_transmit.c,v 1.2 1998/10/18 11:58:57 phk Exp $
+ *	@(#) $Id: eni_transmit.c,v 1.3 1998/10/31 20:06:45 phk Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_transmit.c,v 1.2 1998/10/18 11:58:57 phk Exp $");
+__RCSID("@(#) $Id: eni_transmit.c,v 1.3 1998/10/31 20:06:45 phk Exp $");
 #endif
 
 /*
@@ -463,7 +463,7 @@ retry:
 		 * Get start of data onto full-word alignment
 		 */
 		KB_DATASTART ( m, cp, caddr_t );
-		if ( align = ((u_int)cp) & (sizeof(u_long)-1)) {
+		if ((align = ((u_int)cp) & (sizeof(u_long)-1)) != 0) {
 			/*
 			 * Gotta slide the data up
 			 */
@@ -622,7 +622,7 @@ retry:
 	 * AAL5 PDUs need an extra two words for control/length and
 	 * CRC. Check for AAL5 and add requirements here.
 	 */
-	if (aal5 = (evp->ev_connvc->cvc_attr.aal.type == ATM_AAL5))
+	if ((aal5 = (evp->ev_connvc->cvc_attr.aal.type == ATM_AAL5)) != 0)
 		size = pdulen + 2 * sizeof(long);
 	else
 		size = pdulen;
-- 
cgit v1.3