From cf8e8cebcc0d1caa79eb2e92784961cfe301f5bb Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Fri, 29 Jan 1999 08:29:05 +0000
Subject: Removed bogus casts to c_caddr_t.  This is part of terminating
 c_caddr_t with extreme prejudice.  Here the original casts to caddr_t were to
 support K&R compilers (or missing prototypes), but the relevant source files
 require an ANSI compiler.

---
 sys/dev/de/if_de.c      | 7 +++----
 sys/kern/kern_threads.c | 4 ++--
 sys/kern/vfs_aio.c      | 4 ++--
 sys/pci/if_de.c         | 7 +++----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index f6d120d..e8c2ae4 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_de.c,v 1.80 1998/09/25 18:06:53 matt Exp $	*/
-/*	$Id: if_de.c,v 1.95 1999/01/28 00:57:52 dillon Exp $ */
+/*	$Id: if_de.c,v 1.96 1999/01/28 17:32:02 dillon Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -2412,7 +2412,7 @@ tulip_srom_decode(
     /*
      * Save the hardware address.
      */
-    bcopy((c_caddr_t) shp->sh_ieee802_address, (v_caddr_t) sc->tulip_enaddr, 6);
+    bcopy(shp->sh_ieee802_address, (v_caddr_t) sc->tulip_enaddr, 6);
     /*
      * If this is a multiple port card, add the adapter index to the last
      * byte of the hardware address.  (if it isn't multiport, adding 0
@@ -2972,8 +2972,7 @@ tulip_read_macaddr(
      * Check for various boards based on OUI.  Did I say braindead?
      */
     for (idx = 0; tulip_vendors[idx].vendor_identify_nic != NULL; idx++) {
-	if (bcmp((c_caddr_t) sc->tulip_enaddr,
-		 (c_caddr_t) tulip_vendors[idx].vendor_oui, 3) == 0) {
+	if (bcmp(sc->tulip_enaddr, tulip_vendors[idx].vendor_oui, 3) == 0) {
 	    (*tulip_vendors[idx].vendor_identify_nic)(sc);
 	    break;
 	}
diff --git a/sys/kern/kern_threads.c b/sys/kern/kern_threads.c
index 6c7bcf2..ba5b35d 100644
--- a/sys/kern/kern_threads.c
+++ b/sys/kern/kern_threads.c
@@ -46,7 +46,7 @@
  * in Germany will I accept domestic beer.  This code may or may not work
  * and I certainly make no claims as to its fitness for *any* purpose.
  * 
- * $Id: kern_threads.c,v 1.12 1999/01/27 21:49:56 dillon Exp $
+ * $Id: kern_threads.c,v 1.13 1999/01/28 17:31:59 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -79,7 +79,7 @@ thr_sleep(struct proc *p, struct thr_sleep_args *uap) {
 		/*
 		 * Get timespec struct
 		 */
-		if ((error = copyin((c_caddr_t) uap->timeout, (caddr_t) &ts, sizeof ts)) != 0) {
+		if ((error = copyin(uap->timeout, &ts, sizeof(ts))) != 0) {
 			p->p_wakeup = 0;
 			return error;
 		}
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 5fa6a237..b6178df 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -13,7 +13,7 @@
  * bad that happens because of using this software isn't the responsibility
  * of the author.  This software is distributed AS-IS.
  *
- * $Id: vfs_aio.c,v 1.39 1999/01/28 00:57:47 dillon Exp $
+ * $Id: vfs_aio.c,v 1.40 1999/01/28 17:32:00 dillon Exp $
  */
 
 /*
@@ -1472,7 +1472,7 @@ aio_suspend(struct proc *p, struct aio_suspend_args *uap)
 		/*
 		 * Get timespec struct
 		 */
-		if ((error = copyin((c_caddr_t) uap->timeout, (caddr_t) &ts, sizeof ts)) != 0) {
+		if ((error = copyin(uap->timeout, &ts, sizeof(ts))) != 0) {
 			return error;
 		}
 
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index f6d120d..e8c2ae4 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_de.c,v 1.80 1998/09/25 18:06:53 matt Exp $	*/
-/*	$Id: if_de.c,v 1.95 1999/01/28 00:57:52 dillon Exp $ */
+/*	$Id: if_de.c,v 1.96 1999/01/28 17:32:02 dillon Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -2412,7 +2412,7 @@ tulip_srom_decode(
     /*
      * Save the hardware address.
      */
-    bcopy((c_caddr_t) shp->sh_ieee802_address, (v_caddr_t) sc->tulip_enaddr, 6);
+    bcopy(shp->sh_ieee802_address, (v_caddr_t) sc->tulip_enaddr, 6);
     /*
      * If this is a multiple port card, add the adapter index to the last
      * byte of the hardware address.  (if it isn't multiport, adding 0
@@ -2972,8 +2972,7 @@ tulip_read_macaddr(
      * Check for various boards based on OUI.  Did I say braindead?
      */
     for (idx = 0; tulip_vendors[idx].vendor_identify_nic != NULL; idx++) {
-	if (bcmp((c_caddr_t) sc->tulip_enaddr,
-		 (c_caddr_t) tulip_vendors[idx].vendor_oui, 3) == 0) {
+	if (bcmp(sc->tulip_enaddr, tulip_vendors[idx].vendor_oui, 3) == 0) {
 	    (*tulip_vendors[idx].vendor_identify_nic)(sc);
 	    break;
 	}
-- 
cgit v1.1