about summary refs log tree commit diff
path: root/mach
diff options
context:
space:
mode:
authorFlavio Cruz <flaviocruz@gmail.com>2023-11-19 00:08:47 -0500
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2023-11-19 10:21:28 +0100
commit6ae7b5f43d4b13f24606d7108d822e469a96af3d (patch)
treebde81fd6bed243c3076b0040de6f8754c72cd6d8 /mach
parentf11a92993c45a91c3237733486ce2b8735af2ba0 (diff)
downloadglibc-6ae7b5f43d4b13f24606d7108d822e469a96af3d.tar.gz
glibc-6ae7b5f43d4b13f24606d7108d822e469a96af3d.tar.xz
glibc-6ae7b5f43d4b13f24606d7108d822e469a96af3d.zip
Remove untyped mach RPC code.
Existing MiG does not support untyped messages and the Hurd will
continue to use typed messages for the foreseeable future.
Message-ID: <ZVmYX6j4pYNUfqn4@jupiter.tail36e24.ts.net>
Diffstat (limited to 'mach')
-rw-r--r--mach/msg-destroy.c64
-rw-r--r--mach/msgserver.c4
2 files changed, 0 insertions, 68 deletions
diff --git a/mach/msg-destroy.c b/mach/msg-destroy.c
index 0a8b46c895..19137baa62 100644
--- a/mach/msg-destroy.c
+++ b/mach/msg-destroy.c
@@ -71,69 +71,6 @@ __mach_msg_destroy (mach_msg_header_t *msg)
     mach_msg_destroy_port(msg->msgh_remote_port, MACH_MSGH_BITS_REMOTE(mbits));
 
     if (mbits & MACH_MSGH_BITS_COMPLEX) {
-#ifdef MACH_MSG_PORT_DESCRIPTOR
-	mach_msg_body_t		*body;
-	mach_msg_descriptor_t	*saddr, *eaddr;
-
-	body = (mach_msg_body_t *) (msg + 1);
-	saddr = (mach_msg_descriptor_t *)
-			((mach_msg_base_t *) msg + 1);
-	eaddr =  saddr + body->msgh_descriptor_count;
-
-	for  ( ; saddr < eaddr; saddr++) {
-	    switch (saddr->type.type) {
-
-	        case MACH_MSG_PORT_DESCRIPTOR: {
-		    mach_msg_port_descriptor_t *dsc;
-
-		    /*
-		     * Destroy port rights carried in the message
-		     */
-		    dsc = &saddr->port;
-		    mach_msg_destroy_port(dsc->name, dsc->disposition);
-		    break;
-	        }
-
-	        case MACH_MSG_OOL_DESCRIPTOR : {
-		    mach_msg_ool_descriptor_t *dsc;
-
-		    /*
-		     * Destroy memory carried in the message
-		     */
-		    dsc = &saddr->out_of_line;
-		    if (dsc->deallocate) {
-		        mach_msg_destroy_memory((vm_offset_t)dsc->address,
-						dsc->size);
-		    }
-		    break;
-	        }
-
-	        case MACH_MSG_OOL_PORTS_DESCRIPTOR : {
-		    mach_port_t             		*ports;
-		    mach_msg_ool_ports_descriptor_t	*dsc;
-		    mach_msg_type_number_t   		j;
-
-		    /*
-		     * Destroy port rights carried in the message
-		     */
-		    dsc = &saddr->ool_ports;
-		    ports = (mach_port_t *) dsc->address;
-		    for (j = 0; j < dsc->count; j++, ports++)  {
-		        mach_msg_destroy_port(*ports, dsc->disposition);
-		    }
-
-		    /*
-		     * Destroy memory carried in the message
-		     */
-		    if (dsc->deallocate) {
-		        mach_msg_destroy_memory((vm_offset_t)dsc->address,
-					dsc->count * sizeof(mach_port_t));
-		    }
-		    break;
-	        }
-	    }
-	}
-#else
 	vm_offset_t saddr;
 	vm_offset_t eaddr;
 
@@ -185,7 +122,6 @@ __mach_msg_destroy (mach_msg_header_t *msg)
 		saddr += sizeof(vm_offset_t);
 	    }
 	}
-#endif
     }
 }
 
diff --git a/mach/msgserver.c b/mach/msgserver.c
index 9ffe71ed60..8f8beeddb5 100644
--- a/mach/msgserver.c
+++ b/mach/msgserver.c
@@ -66,10 +66,6 @@
 #include <stdlib.h>		/* For malloc and free.  */
 #include <assert.h>
 
-#ifdef NDR_CHAR_ASCII		/* OSF Mach flavors have different names.  */
-# define mig_reply_header_t	mig_reply_error_t
-#endif
-
 mach_msg_return_t
 __mach_msg_server_timeout (boolean_t (*demux) (mach_msg_header_t *request,
 					       mach_msg_header_t *reply),