From 9640c4dba6b4a8f5e01b2b67fc47a836818bc38d Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Wed, 23 Jul 2008 23:38:52 +0000 Subject: 2008-07-23 Barry deFreese * i386/i386/locore.h (copyinmsg, copyoutmsg): Make parameters const void* and void* instead of vm_offset_t. * i386/i386at/com.c (comportdeath): Cast port as ipc_port_t in tty_portdeath call. * i386/i386at/kd.c (kdportdeath): Likewise. * i386/i386at/lpr.c (lprportdeath): Likewise. * i386/i386at/kd_mouse.c (mouse_handle_byte): Cast param to wakeup() as vm_offset_t. * i386/intel/pmap.c (pmap_destroy): Cast arg 2 of kmem_free() to vm_offset_t. * i386/intel/pmap.h: Cast all arg 1 params to kvtophy() to vm_offset_t. * ipc/ipc_kmsg.c: Remove casts from params to copyinmsg and copyoutmsg calls. * ipc/mach_msg.c: Likewise. * kern/exceptions.c: Likewise. * ipc/mach_msg.c: Remove casts from params to copyout calls. * ipc/bootstrap.c: Likewise. * kern/ipc_tt.c (mach_ports_register): Cast memory[i] as ipc_port_t in assignment. --- ipc/mach_msg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ipc/mach_msg.c') diff --git a/ipc/mach_msg.c b/ipc/mach_msg.c index e6bcf613..43ae918a 100644 --- a/ipc/mach_msg.c +++ b/ipc/mach_msg.c @@ -222,8 +222,8 @@ mach_msg_receive(msg, option, rcv_size, rcv_name, time_out, notify) assert(real_size > rcv_size); - (void) copyout((vm_offset_t) &real_size, - (vm_offset_t) &msg->msgh_size, + (void) copyout(&real_size, + &msg->msgh_size, sizeof(mach_msg_size_t)); } @@ -313,8 +313,8 @@ mach_msg_receive_continue(void) assert(real_size > rcv_size); - (void) copyout((vm_offset_t) &real_size, - (vm_offset_t) &msg->msgh_size, + (void) copyout(&real_size, + &msg->msgh_size, sizeof(mach_msg_size_t)); } @@ -460,7 +460,7 @@ mach_msg_trap(msg, option, send_size, rcv_size, rcv_name, time_out, notify) ikm_cache() = IKM_NULL; ikm_check_initialized(kmsg, IKM_SAVED_KMSG_SIZE); - if (copyinmsg((vm_offset_t) msg, (vm_offset_t) &kmsg->ikm_header, + if (copyinmsg(msg, &kmsg->ikm_header, send_size)) { ikm_free(kmsg); goto slow_get; @@ -1244,7 +1244,7 @@ mach_msg_trap(msg, option, send_size, rcv_size, rcv_name, time_out, notify) ikm_check_initialized(kmsg, kmsg->ikm_size); if ((kmsg->ikm_size != IKM_SAVED_KMSG_SIZE) || - copyoutmsg((vm_offset_t) &kmsg->ikm_header, (vm_offset_t) msg, + copyoutmsg(&kmsg->ikm_header, msg, reply_size) || (ikm_cache() != IKM_NULL)) goto slow_put; -- cgit v1.2.3