summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_subr.c
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/kern/kern_subr.c
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/kern/kern_subr.c')
-rw-r--r--sys/kern/kern_subr.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index a225192..3ab216a 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)kern_subr.c 8.3 (Berkeley) 1/21/94
- * $Id: kern_subr.c,v 1.19 1998/02/06 12:13:25 eivind Exp $
+ * $Id: kern_subr.c,v 1.20 1998/06/07 17:11:36 dfr Exp $
*/
#include <sys/param.h>
@@ -143,9 +143,9 @@ uiomoveco(cp, n, uio, obj)
case UIO_USERISPACE:
if (uio->uio_rw == UIO_READ) {
if (vfs_ioopt && ((cnt & PAGE_MASK) == 0) &&
- ((((long) iov->iov_base) & PAGE_MASK) == 0) &&
+ ((((intptr_t) iov->iov_base) & PAGE_MASK) == 0) &&
((uio->uio_offset & PAGE_MASK) == 0) &&
- ((((long) cp) & PAGE_MASK) == 0)) {
+ ((((intptr_t) cp) & PAGE_MASK) == 0)) {
error = vm_uiomove(&curproc->p_vmspace->vm_map, obj,
uio->uio_offset, cnt,
(vm_offset_t) iov->iov_base, NULL);
@@ -208,7 +208,7 @@ uioread(n, uio, obj, nread)
cnt = n;
if ((uio->uio_segflg == UIO_USERSPACE) &&
- ((((long) iov->iov_base) & PAGE_MASK) == 0) &&
+ ((((intptr_t) iov->iov_base) & PAGE_MASK) == 0) &&
((uio->uio_offset & PAGE_MASK) == 0) ) {
if (cnt < PAGE_SIZE)
OpenPOWER on IntegriCloud