Use [u]intptr_t instead of [u_]long for casts between pointers and

integers.  Don't forget to cast to (void *) as well.

2 files changed, 10 insertions, 11 deletions

diff --git a/sys/miscfs/devfs/devfs_vfsops.c b/sys/miscfs/devfs/devfs_vfsops.c
index 06323711..ffa12ea 100644
--- a/sys/miscfs/devfs/devfs_vfsops.c
+++ b/sys/miscfs/devfs/devfs_vfsops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- *	$Id: devfs_vfsops.c,v 1.29 1998/04/19 23:32:12 julian Exp $
+ *	$Id: devfs_vfsops.c,v 1.30 1998/05/06 05:29:32 msmith Exp $
  *
  */
 
@@ -123,7 +123,7 @@ DBPRINT(("mount "));
 	 */
 	mp->mnt_data = (qaddr_t)devfs_mp_p;
 	mp->mnt_stat.f_type = MOUNT_DEVFS;
-	mp->mnt_stat.f_fsid.val[0] = (long)devfs_mp_p;
+	mp->mnt_stat.f_fsid.val[0] = (intptr_t)(void *)devfs_mp_p;
 	mp->mnt_stat.f_fsid.val[1] = MOUNT_DEVFS;
 	mp->mnt_flag |= MNT_LOCAL;
 
@@ -228,7 +228,7 @@ DBPRINT(("statfs "));
 	sbp->f_bavail = 0;
 	sbp->f_files  = 128;
 	sbp->f_ffree  = 0;		/* what to put in here? */
-	sbp->f_fsid.val[0] = (long)devfs_mp_p;
+	sbp->f_fsid.val[0] = (intptr_t)(void *)devfs_mp_p;
 	sbp->f_fsid.val[1] = MOUNT_DEVFS;
 
 /*-
diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c
index bc82ac0..a11413b 100644
--- a/sys/miscfs/devfs/devfs_vnops.c
+++ b/sys/miscfs/devfs/devfs_vnops.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
- *	$Id: devfs_vnops.c,v 1.57 1998/07/05 23:10:21 julian Exp $
+ *	$Id: devfs_vnops.c,v 1.58 1998/07/30 17:40:44 bde Exp $
  */
 
 
@@ -428,8 +428,8 @@ DBPRINT(("getattr\n"));
 	vap->va_nlink = file_node->links;
 	vap->va_uid = file_node->uid;
 	vap->va_gid = file_node->gid;
-	vap->va_fsid = (long)file_node->dvm;
-	vap->va_fileid = (long)file_node;
+	vap->va_fsid = (intptr_t)(void *)file_node->dvm;
+	vap->va_fileid = (intptr_t)(void *)file_node;
 	vap->va_size = file_node->len; /* now a u_quad_t */
 	vap->va_blocksize = 512;
 	/*
@@ -1135,7 +1135,7 @@ DBPRINT(("readdir\n"));
 		switch(nodenumber)
 		{
 		case	0:
-			dirent.d_fileno = (unsigned long int)dir_node;
+			dirent.d_fileno = (uintptr_t)(void *)dir_node;
 			name = ".";
 			dirent.d_namlen = 1;
 			dirent.d_type = DT_DIR;
@@ -1143,16 +1143,15 @@ DBPRINT(("readdir\n"));
 		case	1:
 			if(dir_node->by.Dir.parent)
 				dirent.d_fileno
-				 = (unsigned long int)dir_node->by.Dir.parent;
+				 = (uintptr_t)(void *)dir_node->by.Dir.parent;
 			else
-				dirent.d_fileno = (unsigned long int)dir_node;
+				dirent.d_fileno = (uintptr_t)(void *)dir_node;
 			name = "..";
 			dirent.d_namlen = 2;
 			dirent.d_type = DT_DIR;
 			break;
 		default:
-			dirent.d_fileno =
-				(unsigned long int)name_node->dnp;
+			dirent.d_fileno = (uintptr_t)(void *)name_node->dnp;
 			dirent.d_namlen = strlen(name_node->name);
 			name = name_node->name;
 			switch(name_node->dnp->type) {