aboutsummaryrefslogtreecommitdiff
path: root/kern/exception.c
diff options
context:
space:
mode:
authorLuca Dariz <luca@orpolo.org>2023-01-16 11:58:57 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2023-01-18 02:31:51 +0100
commitfc6bcf785b702e7e8a675ea0fe9856cc1b24b8f6 (patch)
tree23e99832f6ea6dc52bf7f6fdb137d58218410773 /kern/exception.c
parentf056fcda8bf9a5c375b20ef3803718187d9d4211 (diff)
downloadgnumach-fc6bcf785b702e7e8a675ea0fe9856cc1b24b8f6.tar.gz
gnumach-fc6bcf785b702e7e8a675ea0fe9856cc1b24b8f6.tar.bz2
gnumach-fc6bcf785b702e7e8a675ea0fe9856cc1b24b8f6.zip
replace mach_port_t with mach_port_name_t
This is a cleanup following the introduction of mach_port_name_t. The same set of changes is applied to all files: - rename mach_port_t to mach_port_name_t where a port name is used, - use MACH_PORT_NAME_NULL and MACH_PORT_NAME_DEAD where appropriate, - use invalid_port_to_name() and invalid_name_to_port() for conversion where appropriate, - use regular copyout() insted of copyout_port() when we deal with mach_port_name_t already before copyout, - use the new helper ipc_kmsg_copyout_object_to_port() when we really want to place a port name in the space of a mach_port_t. * include/mach/notify.h: Likewise * ipc/ipc_entry.c: Likewise * ipc/ipc_kmsg.c: Likewise * ipc/ipc_kmsg.h: Likewise, and add ipc_kmsg_copyout_object_to_port() * ipc/ipc_marequest.c: Likewise * ipc/ipc_object.c: Likewise * ipc/ipc_port.c: Likewise * ipc/ipc_space.h: Likewise * ipc/mach_msg.c: Likewise * ipc/mach_port.c: Likewise * kern/exception.c: Likewise * kern/ipc_mig.c: Likewise Message-Id: <20230116105857.240210-8-luca@orpolo.org>
Diffstat (limited to 'kern/exception.c')
-rw-r--r--kern/exception.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/kern/exception.c b/kern/exception.c
index 0d8191a7..1014b3ed 100644
--- a/kern/exception.c
+++ b/kern/exception.c
@@ -269,9 +269,9 @@ exception_no_server(void)
struct mach_exception {
mach_msg_header_t Head;
mach_msg_type_t threadType;
- mach_port_name_t thread;
+ mach_port_t thread;
mach_msg_type_t taskType;
- mach_port_name_t task;
+ mach_port_t task;
mach_msg_type_t exceptionType;
integer_t exception;
mach_msg_type_t codeType;
@@ -658,10 +658,10 @@ exception_raise(
* to handle the two ports in the body.
*/
- mr = (ipc_kmsg_copyout_object(space, (ipc_object_t) thread_port,
- MACH_MSG_TYPE_PORT_SEND, &exc->thread) |
- ipc_kmsg_copyout_object(space, (ipc_object_t) task_port,
- MACH_MSG_TYPE_PORT_SEND, &exc->task));
+ mr = (ipc_kmsg_copyout_object_to_port(space, (ipc_object_t) thread_port,
+ MACH_MSG_TYPE_PORT_SEND, &exc->thread) |
+ ipc_kmsg_copyout_object_to_port(space, (ipc_object_t) task_port,
+ MACH_MSG_TYPE_PORT_SEND, &exc->task));
if (mr != MACH_MSG_SUCCESS) {
(void) ipc_kmsg_put(receiver->ith_msg, kmsg,
kmsg->ikm_header.msgh_size);