From d776a59723b22192d33557d2127e13cb31905382 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 3 Dec 2023 02:06:29 +0100 Subject: Revert "Update code to handle the new ABI for sending inlined port rights." This reverts commit 7e23b3c2c008e0b9b5da055e675d40cc27bb10ef. --- mach/msg-destroy.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'mach') diff --git a/mach/msg-destroy.c b/mach/msg-destroy.c index 8640c965bd..19137baa62 100644 --- a/mach/msg-destroy.c +++ b/mach/msg-destroy.c @@ -108,17 +108,11 @@ __mach_msg_destroy (mach_msg_header_t *msg) addr = is_inline ? saddr : * (vm_offset_t *) saddr; if (MACH_MSG_TYPE_PORT_ANY(name)) { + mach_port_t *ports = (mach_port_t *) addr; mach_msg_type_number_t i; - if (is_inline) { - mach_port_name_inlined_t *inlined_ports = (mach_port_name_inlined_t *)addr; - for (i = 0; i < number; i++) - mach_msg_destroy_port(inlined_ports[i].name, name); - } else { - mach_port_t *ports = (mach_port_t *) addr; - for (i = 0; i < number; i++) - mach_msg_destroy_port(ports[i], name); - } + for (i = 0; i < number; i++) + mach_msg_destroy_port(*ports++, name); } if (is_inline) { -- cgit 1.4.1