diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2008-07-23 23:38:52 +0000 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-06-18 00:27:18 +0200 |
| commit | 9640c4dba6b4a8f5e01b2b67fc47a836818bc38d (patch) | |
| tree | 821759afd42703c37e0d723e58a67830746d1cfd /ipc | |
| parent | 482cc1b78fae30281528145098ab8d9908d5fafe (diff) | |
2008-07-23 Barry deFreese <bddebian@comcast.net>
* 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.
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_kmsg.c | 4 | ||||
| -rw-r--r-- | ipc/mach_msg.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ipc/ipc_kmsg.c b/ipc/ipc_kmsg.c index dff0540..a12c947 100644 --- a/ipc/ipc_kmsg.c +++ b/ipc/ipc_kmsg.c @@ -531,7 +531,7 @@ ipc_kmsg_get(msg, size, kmsgp) ikm_init(kmsg, size); } - if (copyinmsg((char *) msg, (char *) &kmsg->ikm_header, size)) { + if (copyinmsg(msg, &kmsg->ikm_header, size)) { ikm_free(kmsg); return MACH_SEND_INVALID_DATA; } @@ -601,7 +601,7 @@ ipc_kmsg_put(msg, kmsg, size) ikm_check_initialized(kmsg, kmsg->ikm_size); - if (copyoutmsg((char *) &kmsg->ikm_header, (char *) msg, size)) + if (copyoutmsg(&kmsg->ikm_header, msg, size)) mr = MACH_RCV_INVALID_DATA; else mr = MACH_MSG_SUCCESS; diff --git a/ipc/mach_msg.c b/ipc/mach_msg.c index e6bcf61..43ae918 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; |