summaryrefslogtreecommitdiffstats
path: root/sys/fs
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1998-07-15 02:32:35 +0000
committerbde <bde@FreeBSD.org>1998-07-15 02:32:35 +0000
commit863d5c8b6850a65e8b4e00a7b23bbd29bd466602 (patch)
tree503589837ac05f783d5305211b0f41aed97e2041 /sys/fs
parentb99f2f9d598baa39c296f1cf2d910a1f7e138bb1 (diff)
downloadFreeBSD-src-863d5c8b6850a65e8b4e00a7b23bbd29bd466602.zip
FreeBSD-src-863d5c8b6850a65e8b4e00a7b23bbd29bd466602.tar.gz
Cast pointers to uintptr_t/intptr_t instead of to u_long/long,
respectively. Most of the longs should probably have been u_longs, but this changes is just to prevent warnings about casts between pointers and integers of different sizes, not to fix poorly chosen types.
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/nullfs/null_subr.c4
-rw-r--r--sys/fs/procfs/procfs_mem.c4
-rw-r--r--sys/fs/specfs/spec_vnops.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c
index 7244d05..e4d49b6 100644
--- a/sys/fs/nullfs/null_subr.c
+++ b/sys/fs/nullfs/null_subr.c
@@ -35,7 +35,7 @@
*
* @(#)null_subr.c 8.7 (Berkeley) 5/14/95
*
- * $Id: null_subr.c,v 1.16 1998/02/06 12:13:36 eivind Exp $
+ * $Id: null_subr.c,v 1.17 1998/02/09 06:09:45 eivind Exp $
*/
#include "opt_debug_nullfs.h"
@@ -60,7 +60,7 @@
*/
#define NULL_NHASH(vp) \
- (&null_node_hashtbl[(((u_long)vp)>>LOG2_SIZEVNODE) & null_node_hash])
+ (&null_node_hashtbl[(((uintptr_t)vp)>>LOG2_SIZEVNODE) & null_node_hash])
static LIST_HEAD(null_node_hashhead, null_node) *null_node_hashtbl;
static u_long null_node_hash;
diff --git a/sys/fs/procfs/procfs_mem.c b/sys/fs/procfs/procfs_mem.c
index 27cb4f5..c1012f1 100644
--- a/sys/fs/procfs/procfs_mem.c
+++ b/sys/fs/procfs/procfs_mem.c
@@ -37,7 +37,7 @@
*
* @(#)procfs_mem.c 8.5 (Berkeley) 6/15/94
*
- * $Id: procfs_mem.c,v 1.32 1998/05/19 00:00:14 tegge Exp $
+ * $Id: procfs_mem.c,v 1.33 1998/06/07 17:11:57 dfr Exp $
*/
/*
@@ -159,7 +159,7 @@ procfs_rwmem(curp, p, uio)
fill_eproc (p, &p->p_addr->u_kproc.kp_eproc);
/* locate the in-core address */
- tkva = (u_long)p->p_addr + uva - VM_MAXUSER_ADDRESS;
+ tkva = (uintptr_t)p->p_addr + uva - VM_MAXUSER_ADDRESS;
/* transfer it */
error = uiomove((caddr_t)tkva, len, uio);
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index cb9a120..7f05eb2 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)spec_vnops.c 8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.65 1998/07/04 22:30:23 julian Exp $
+ * $Id: spec_vnops.c,v 1.66 1998/07/11 07:45:48 bde Exp $
*/
#include <sys/param.h>
@@ -430,7 +430,7 @@ spec_ioctl(ap)
ap->a_fflag, ap->a_p));
case VBLK:
- if (ap->a_command == 0 && (long)ap->a_data == B_TAPE)
+ if (ap->a_command == 0 && (intptr_t)ap->a_data == B_TAPE)
if ((bdevsw[major(dev)]->d_flags & D_TYPEMASK) ==
D_TAPE)
return (0);
OpenPOWER on IntegriCloud