diff options
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_entry.h | 2 | ||||
| -rw-r--r-- | ipc/ipc_hash.h | 16 | ||||
| -rw-r--r-- | ipc/ipc_init.c | 2 | ||||
| -rw-r--r-- | ipc/ipc_kmsg.c | 56 | ||||
| -rw-r--r-- | ipc/ipc_kmsg.h | 20 | ||||
| -rw-r--r-- | ipc/ipc_marequest.c | 14 | ||||
| -rw-r--r-- | ipc/ipc_marequest.h | 16 | ||||
| -rw-r--r-- | ipc/ipc_mqueue.c | 14 | ||||
| -rw-r--r-- | ipc/ipc_mqueue.h | 14 | ||||
| -rw-r--r-- | ipc/ipc_notify.c | 20 | ||||
| -rw-r--r-- | ipc/ipc_notify.h | 16 | ||||
| -rw-r--r-- | ipc/ipc_object.c | 18 | ||||
| -rw-r--r-- | ipc/ipc_object.h | 16 | ||||
| -rw-r--r-- | ipc/ipc_port.c | 24 | ||||
| -rw-r--r-- | ipc/ipc_port.h | 10 | ||||
| -rw-r--r-- | ipc/ipc_pset.c | 2 | ||||
| -rw-r--r-- | ipc/ipc_pset.h | 2 | ||||
| -rw-r--r-- | ipc/ipc_right.c | 64 | ||||
| -rw-r--r-- | ipc/ipc_right.h | 16 | ||||
| -rw-r--r-- | ipc/ipc_space.c | 6 | ||||
| -rw-r--r-- | ipc/ipc_space.h | 8 | ||||
| -rw-r--r-- | ipc/mach_debug.c | 20 | ||||
| -rw-r--r-- | ipc/mach_msg.c | 12 | ||||
| -rw-r--r-- | ipc/mach_msg.h | 16 | ||||
| -rw-r--r-- | ipc/mach_port.c | 8 |
25 files changed, 206 insertions, 206 deletions
diff --git a/ipc/ipc_entry.h b/ipc/ipc_entry.h index ea0c0a2..6e316bd 100644 --- a/ipc/ipc_entry.h +++ b/ipc/ipc_entry.h @@ -155,4 +155,4 @@ ipc_entry_dealloc(/* ipc_space_t space, mach_port_t name, extern kern_return_t ipc_entry_grow_table(/* ipc_space_t space */); -#endif _IPC_IPC_ENTRY_H_ +#endif /* _IPC_IPC_ENTRY_H_ */ diff --git a/ipc/ipc_hash.h b/ipc/ipc_hash.h index f4c2f55..bf5e9ac 100644 --- a/ipc/ipc_hash.h +++ b/ipc/ipc_hash.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -47,7 +47,7 @@ ipc_hash_init(); extern unsigned int ipc_hash_info(/* hash_info_bucket_t *, unsigned int */); -#endif MACH_IPC_DEBUG +#endif /* MACH_IPC_DEBUG */ extern boolean_t ipc_hash_lookup(/* ipc_space_t space, ipc_object_t obj, @@ -91,4 +91,4 @@ extern void ipc_hash_local_delete(/* ipc_space_t space, ipc_object_t obj, mach_port_index_t index, ipc_entry_t entry */); -#endif _IPC_IPC_HASH_H_ +#endif /* _IPC_IPC_HASH_H_ */ diff --git a/ipc/ipc_init.c b/ipc/ipc_init.c index 371a06f..e94705c 100644 --- a/ipc/ipc_init.c +++ b/ipc/ipc_init.c @@ -111,7 +111,7 @@ ipc_bootstrap(void) #if NORMA_IPC kr = ipc_space_create_special(&ipc_space_remote); assert(kr == KERN_SUCCESS); -#endif NORMA_IPC +#endif /* NORMA_IPC */ /* initialize modules with hidden data structures */ diff --git a/ipc/ipc_kmsg.c b/ipc/ipc_kmsg.c index d860fd1..21a3ecf 100644 --- a/ipc/ipc_kmsg.c +++ b/ipc/ipc_kmsg.c @@ -473,7 +473,7 @@ ipc_kmsg_free(kmsg) /* return it to the norma ipc code */ norma_kmsg_put(kmsg); break; -#endif NORMA_IPC +#endif /* NORMA_IPC */ case IKM_SIZE_NETWORK: /* return it to the network code */ @@ -1251,9 +1251,9 @@ ipc_kmsg_copyin_header(msg, space, notify) reply_soright = IP_NULL; goto skip_reply_checks; } -#else MACH_IPC_COMPAT +#else /* MACH_IPC_COMPAT */ assert(kr == KERN_SUCCESS); -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ if ((saved_reply != IP_NULL) && (reply_port == IO_DEAD)) { ipc_port_t dest = (ipc_port_t) dest_port; @@ -1321,7 +1321,7 @@ ipc_kmsg_copyin_header(msg, space, notify) * and the port died on us. In this case, the copyin * code already deallocated reply_entry. */ -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ if (IE_BITS_TYPE(dest_entry->ie_bits) == MACH_PORT_TYPE_NONE) ipc_entry_dealloc(space, dest_name, dest_entry); @@ -1398,7 +1398,7 @@ ipc_kmsg_copyin_body(kmsg, space, map) use_page_lists = TRUE; steal_pages = TRUE; } -#endif NORMA_IPC +#endif /* NORMA_IPC */ saddr = (vm_offset_t) (&kmsg->ikm_header + 1); eaddr = (vm_offset_t) &kmsg->ikm_header + kmsg->ikm_header.msgh_size; @@ -1482,7 +1482,7 @@ ipc_kmsg_copyin_body(kmsg, space, map) if (sizeof(vm_offset_t) > sizeof(mach_msg_type_t)) saddr = ptr_align(saddr); - + if ((eaddr - saddr) < sizeof(vm_offset_t)) { ipc_kmsg_clean_partial(kmsg, taddr, FALSE, 0); return MACH_SEND_MSG_TOO_SMALL; @@ -1786,7 +1786,7 @@ ipc_kmsg_copyin_from_kernel( * Nothing locked. * Returns: * MACH_MSG_SUCCESS Copied out port rights. - * MACH_RCV_INVALID_NOTIFY + * MACH_RCV_INVALID_NOTIFY * Notify is non-null and doesn't name a receive right. * (Either KERN_INVALID_NAME or KERN_INVALID_RIGHT.) * MACH_RCV_HEADER_ERROR|MACH_MSG_IPC_SPACE @@ -2746,7 +2746,7 @@ ipc_kmsg_copyout_to_kernel(kmsg, space) kmsg->ikm_header.msgh_local_port = dest_name; kmsg->ikm_header.msgh_remote_port = reply_name; } -#endif NORMA_IPC || NORMA_VM +#endif /* NORMA_IPC || NORMA_VM */ #if MACH_IPC_COMPAT @@ -2829,7 +2829,7 @@ ipc_kmsg_copyin_compat(kmsg, space, map) use_page_lists = TRUE; steal_pages = TRUE; } -#endif NORMA_IPC +#endif /* NORMA_IPC */ saddr = (vm_offset_t) (&kmsg->ikm_header + 1); eaddr = (vm_offset_t) &kmsg->ikm_header + kmsg->ikm_header.msgh_size; @@ -3211,7 +3211,7 @@ ipc_kmsg_copyout_compat(kmsg, space, map) return MACH_MSG_SUCCESS; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ #include <mach_kdb.h> #if MACH_KDB @@ -3224,66 +3224,66 @@ ipc_type_name(type_name, received) switch (type_name) { case MACH_MSG_TYPE_BOOLEAN: return "boolean"; - + case MACH_MSG_TYPE_INTEGER_16: return "short"; - + case MACH_MSG_TYPE_INTEGER_32: return "int32"; case MACH_MSG_TYPE_INTEGER_64: return "int64"; - + case MACH_MSG_TYPE_CHAR: return "char"; - + case MACH_MSG_TYPE_BYTE: return "byte"; - + case MACH_MSG_TYPE_REAL: return "real"; - + case MACH_MSG_TYPE_STRING: return "string"; - + case MACH_MSG_TYPE_PORT_NAME: return "port_name"; - + case MACH_MSG_TYPE_MOVE_RECEIVE: if (received) { return "port_receive"; } else { return "move_receive"; } - + case MACH_MSG_TYPE_MOVE_SEND: if (received) { return "port_send"; } else { return "move_send"; } - + case MACH_MSG_TYPE_MOVE_SEND_ONCE: if (received) { return "port_send_once"; } else { return "move_send_once"; } - + case MACH_MSG_TYPE_COPY_SEND: return "copy_send"; - + case MACH_MSG_TYPE_MAKE_SEND: return "make_send"; - + case MACH_MSG_TYPE_MAKE_SEND_ONCE: return "make_send_once"; - + default: return (char *) 0; } } - + void ipc_print_type_name( int type_name) @@ -3313,9 +3313,9 @@ ipc_kmsg_print(kmsg) db_printf(",page=0x%x,copy=0x%x\n", kmsg->ikm_page, kmsg->ikm_copy); -#else NORMA_IPC +#else /* NORMA_IPC */ db_printf("\n"); -#endif NORMA_IPC +#endif /* NORMA_IPC */ ipc_msg_print(&kmsg->ikm_header); } @@ -3481,4 +3481,4 @@ ipc_msg_print(msgh) } } } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ipc/ipc_kmsg.h b/ipc/ipc_kmsg.h index 8fdbeb5..2ec8c58 100644 --- a/ipc/ipc_kmsg.h +++ b/ipc/ipc_kmsg.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -48,7 +48,7 @@ #if NORMA_IPC #include <vm/vm_page.h> #include <vm/vm_map.h> -#endif NORMA_IPC +#endif /* NORMA_IPC */ /* * This structure is only the header for a kmsg buffer; @@ -70,7 +70,7 @@ typedef struct ipc_kmsg { vm_page_t ikm_page; vm_map_copy_t ikm_copy; unsigned long ikm_source_node; -#endif NORMA_IPC +#endif /* NORMA_IPC */ mach_msg_header_t ikm_header; } *ipc_kmsg_t; @@ -287,5 +287,5 @@ ipc_kmsg_copyin_compat(/* ipc_kmsg_t, ipc_space_t, vm_map_t */); extern mach_msg_return_t ipc_kmsg_copyout_compat(/* ipc_kmsg_t, ipc_space_t, vm_map_t */); -#endif MACH_IPC_COMPAT -#endif _IPC_IPC_KMSG_H_ +#endif /* MACH_IPC_COMPAT */ +#endif /* _IPC_IPC_KMSG_H_ */ diff --git a/ipc/ipc_marequest.c b/ipc/ipc_marequest.c index 6ddffa0..b5abc58 100644 --- a/ipc/ipc_marequest.c +++ b/ipc/ipc_marequest.c @@ -189,7 +189,7 @@ ipc_marequest_create(space, port, notify, marequestp) #if !MACH_IPC_COMPAT assert(notify != MACH_PORT_NULL); -#endif !MACH_IPC_COMPAT +#endif /* !MACH_IPC_COMPAT */ marequest = imar_alloc(); if (marequest == IMAR_NULL) @@ -229,7 +229,7 @@ ipc_marequest_create(space, port, notify, marequestp) if (notify == MACH_PORT_NULL) soright = IP_NULL; else -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ if ((soright = ipc_port_lookup_notify(space, notify)) == IP_NULL) { is_write_unlock(space); @@ -256,7 +256,7 @@ ipc_marequest_create(space, port, notify, marequestp) if (notify == MACH_PORT_NULL) soright = IP_NULL; else -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ if ((soright = ipc_port_lookup_notify(space, notify)) == IP_NULL) { is_write_unlock(space); @@ -373,7 +373,7 @@ ipc_marequest_destroy(marequest) ipc_port_t soright; #if MACH_IPC_COMPAT ipc_port_t sright = IP_NULL; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ is_write_lock(space); @@ -411,7 +411,7 @@ ipc_marequest_destroy(marequest) #if MACH_IPC_COMPAT if (soright == IP_NULL) sright = ipc_space_make_notify(space); -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ } else name = MACH_PORT_NULL; } @@ -431,7 +431,7 @@ ipc_marequest_destroy(marequest) return; } assert(sright == IP_NULL); -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ assert(soright != IP_NULL); ipc_notify_msg_accepted(soright, name); @@ -482,4 +482,4 @@ ipc_marequest_info(maxp, info, count) return ipc_marequest_size; } -#endif MACH_IPC_DEBUG +#endif /* MACH_IPC_DEBUG */ diff --git a/ipc/ipc_marequest.h b/ipc/ipc_marequest.h index 0e0380e..5ea1858 100644 --- a/ipc/ipc_marequest.h +++ b/ipc/ipc_marequest.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -79,7 +79,7 @@ ipc_marequest_init(); extern unsigned int ipc_marequest_info(/* unsigned int *, hash_info_bucket_t *, unsigned int */); -#endif MACH_IPC_DEBUG +#endif /* MACH_IPC_DEBUG */ extern mach_msg_return_t ipc_marequest_create(/* ipc_space_t space, mach_port_t name, @@ -95,4 +95,4 @@ ipc_marequest_rename(/* ipc_space_t space, extern void ipc_marequest_destroy(/* ipc_marequest_t marequest */); -#endif _IPC_IPC_MAREQUEST_H_ +#endif /* _IPC_IPC_MAREQUEST_H_ */ diff --git a/ipc/ipc_mqueue.c b/ipc/ipc_mqueue.c index 5447c49..17af1ff 100644 --- a/ipc/ipc_mqueue.c +++ b/ipc/ipc_mqueue.c @@ -59,7 +59,7 @@ extern ipc_kmsg_t norma_ipc_handoff_msg; extern mach_msg_size_t norma_ipc_handoff_max_size; extern mach_msg_size_t norma_ipc_handoff_msg_size; extern ipc_kmsg_t norma_ipc_kmsg_accept(); -#endif NORMA_IPC +#endif /* NORMA_IPC */ /* * Routine: ipc_mqueue_init @@ -220,7 +220,7 @@ ipc_mqueue_send(kmsg, option, time_out) ip_unlock(port); return mr; } -#endif NORMA_IPC +#endif /* NORMA_IPC */ for (;;) { ipc_thread_t self; @@ -245,7 +245,7 @@ ipc_mqueue_send(kmsg, option, time_out) #if NORMA_IPC /* XXX until ipc_kmsg_destroy is fixed... */ norma_ipc_finish_receiving(&kmsg); -#endif NORMA_IPC +#endif /* NORMA_IPC */ ipc_kmsg_destroy(kmsg); return MACH_MSG_SUCCESS; } @@ -332,7 +332,7 @@ ipc_mqueue_send(kmsg, option, time_out) #if NORMA_IPC /* XXX until ipc_kmsg_destroy is fixed... */ norma_ipc_finish_receiving(&kmsg); -#endif NORMA_IPC +#endif /* NORMA_IPC */ ipc_kmsg_destroy(kmsg); return MACH_MSG_SUCCESS; } @@ -379,7 +379,7 @@ ipc_mqueue_send(kmsg, option, time_out) } norma_ipc_handoff_msg_size = kmsg->ikm_header.msgh_size; } -#endif NORMA_IPC +#endif /* NORMA_IPC */ for (;;) { receiver = ipc_thread_queue_first(receivers); if (receiver == ITH_NULL) { @@ -595,7 +595,7 @@ ipc_mqueue_receive( return MACH_RCV_TOO_LARGE; } } -#endif NORMA_IPC +#endif /* NORMA_IPC */ if (kmsg != IKM_NULL) { /* check space requirements */ @@ -747,7 +747,7 @@ ipc_mqueue_receive( #if NORMA_IPC norma_ipc_finish_receiving(&kmsg); -#endif NORMA_IPC +#endif /* NORMA_IPC */ *kmsgp = kmsg; *seqnop = seqno; return MACH_MSG_SUCCESS; diff --git a/ipc/ipc_mqueue.h b/ipc/ipc_mqueue.h index 690fe28..5c284a3 100644 --- a/ipc/ipc_mqueue.h +++ b/ipc/ipc_mqueue.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -95,7 +95,7 @@ MACRO_BEGIN \ assert(mr == MACH_MSG_SUCCESS); \ MACRO_END -#else MACH_ASSERT +#else /* MACH_ASSERT */ #define ipc_mqueue_send_always(kmsg) \ MACRO_BEGIN \ diff --git a/ipc/ipc_notify.c b/ipc/ipc_notify.c index 870f301..e789edf 100644 --- a/ipc/ipc_notify.c +++ b/ipc/ipc_notify.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -61,9 +61,9 @@ mach_dead_name_notification_t ipc_notify_dead_name_template; */ #define NOTIFY_MSGH_SEQNO MSG_TYPE_EMERGENCY -#else MACH_IPC_COMPAT +#else /* MACH_IPC_COMPAT */ #define NOTIFY_MSGH_SEQNO 0 -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ /* * Routine: ipc_notify_init_port_deleted @@ -388,7 +388,7 @@ ipc_notify_no_senders(port, mscount) norma_ipc_notify_no_senders(ip_nsproxy(port)); return; } -#endif NORMA_IPC +#endif /* NORMA_IPC */ kmsg = ikm_alloc(sizeof *n); if (kmsg == IKM_NULL) { printf("dropped no-senders (0x%08x, %u)\n", port, mscount); @@ -590,4 +590,4 @@ ipc_notify_port_destroyed_compat(port, right) ipc_mqueue_send_always(kmsg); } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ diff --git a/ipc/ipc_notify.h b/ipc/ipc_notify.h index 66e0633..4e5b2e4 100644 --- a/ipc/ipc_notify.h +++ b/ipc/ipc_notify.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -68,5 +68,5 @@ ipc_notify_msg_accepted_compat(/* ipc_port_t, mach_port_t */); extern void ipc_notify_port_destroyed_compat(/* ipc_port_t, ipc_port_t */); -#endif MACH_IPC_COMPAT -#endif _IPC_IPC_NOTIFY_H_ +#endif /* MACH_IPC_COMPAT */ +#endif /* _IPC_IPC_NOTIFY_H_ */ diff --git a/ipc/ipc_object.c b/ipc/ipc_object.c index cdef3cd..caa56fb 100644 --- a/ipc/ipc_object.c +++ b/ipc/ipc_object.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -373,7 +373,7 @@ ipc_object_copyin_type( case MSG_TYPE_PORT_ALL: return MACH_MSG_TYPE_PORT_RECEIVE; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ default: #if MACH_ASSERT @@ -727,7 +727,7 @@ ipc_object_copyout_multiname(space, object, namep) *namep = name; return kr; } -#endif 0 +#endif /* 0 */ /* * Routine: ipc_object_copyout_name @@ -1279,7 +1279,7 @@ ipc_object_copyout_name_compat(space, object, msgt_name, name) return kr; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ #include <mach_kdb.h> diff --git a/ipc/ipc_object.h b/ipc/ipc_object.h index dccec59..892d3ea 100644 --- a/ipc/ipc_object.h +++ b/ipc/ipc_object.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -184,9 +184,9 @@ extern kern_return_t ipc_object_copyout_name_compat(/* ipc_space_t, ipc_object_t, mach_msg_type_name_t, mach_port_t */); -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ extern void ipc_object_print(/* ipc_object_t */); -#endif _IPC_IPC_OBJECT_H_ +#endif /* _IPC_IPC_OBJECT_H_ */ diff --git a/ipc/ipc_port.c b/ipc/ipc_port.c index 770e780..73009b1 100644 --- a/ipc/ipc_port.c +++ b/ipc/ipc_port.c @@ -51,7 +51,7 @@ #include <ipc/ipc_notify.h> #if NORMA_IPC #include <norma/ipc_node.h> -#endif NORMA_IPC +#endif /* NORMA_IPC */ @@ -221,7 +221,7 @@ ipc_port_dngrow(port) return KERN_SUCCESS; } - + /* * Routine: ipc_port_dncancel * Purpose: @@ -508,7 +508,7 @@ ipc_port_init( port->ip_norma_spare2 = 0L; port->ip_norma_spare3 = 0L; port->ip_norma_spare4 = 0L; -#endif NORMA_IPC +#endif /* NORMA_IPC */ ipc_mqueue_init(&port->ip_messages); ipc_thread_queue_init(&port->ip_blocked); @@ -637,7 +637,7 @@ ipc_port_delete_compat(port, space, name) is_release(space); } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ /* * Routine: ipc_port_destroy @@ -702,7 +702,7 @@ ipc_port_destroy( ipc_port_release_send(sright); } } else -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ if (!ipc_port_check_circularity(port, pdrequest)) { /* consumes our refs for port and pdrequest */ @@ -730,7 +730,7 @@ ipc_port_destroy( * destroy any NORMA_IPC state associated with port */ norma_ipc_port_destroy(port); -#endif NORMA_IPC +#endif /* NORMA_IPC */ /* * rouse all blocked senders @@ -804,7 +804,7 @@ ipc_port_destroy( ipr_space(soright), name); continue; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ ipc_notify_dead_name(soright, name); } @@ -1247,7 +1247,7 @@ ipc_port_alloc_special(space) int ret = (int) ipc_port_alloc_special; #endif extern int input_msgh_id; -#endif NORMA_IPC +#endif /* NORMA_IPC */ ipc_port_t port; port = (ipc_port_t) io_alloc(IOT_PORT); @@ -1274,7 +1274,7 @@ ipc_port_alloc_special(space) #if NORMA_IPC port->ip_norma_spare1 = ret; port->ip_norma_spare2 = input_msgh_id; -#endif NORMA_IPC +#endif /* NORMA_IPC */ return port; } @@ -1472,7 +1472,7 @@ ipc_port_copyout_receiver(port, space) return name; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ #include <mach_kdb.h> @@ -1537,9 +1537,9 @@ ipc_port_print(port) printf(", norma_spare2=0x%x", port->ip_norma_spare2); printf(", norma_spare3=0x%x", port->ip_norma_spare3); printf(", norma_spare4=0x%x\n", port->ip_norma_spare4); -#endif NORMA_IPC +#endif /* NORMA_IPC */ indent -=2; } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ipc/ipc_port.h b/ipc/ipc_port.h index 21d4309..6b6fac0 100644 --- a/ipc/ipc_port.h +++ b/ipc/ipc_port.h @@ -116,7 +116,7 @@ struct ipc_port { long ip_norma_spare2; long ip_norma_spare3; long ip_norma_spare4; -#endif NORMA_IPC +#endif /* NORMA_IPC */ }; #define ip_object ip_target.ipt_object @@ -191,7 +191,7 @@ typedef struct ipc_port_request { #define ipr_spacep(soright) ((unsigned int)(soright) & 1) #define ipr_space(soright) ((ipc_space_t)((unsigned int)(soright) &~ 1)) #define ipr_spacem(space) ((ipc_port_t)((unsigned int)(space) | 1)) -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ /* * Taking the ipc_port_multiple lock grants the privilege @@ -381,7 +381,7 @@ ipc_port_copyout_send_compat(/* ipc_port_t, ipc_space_t */); extern mach_port_t ipc_port_copyout_receiver(/* ipc_port_t, ipc_space_t */); -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ extern void ipc_port_print(/* ipc_port_t */); @@ -402,6 +402,6 @@ ipc_port_print(/* ipc_port_t */); #define ip_nsproxy(nsrequest) ((ipc_port_t)((unsigned int)(nsrequest) &~ 1)) #define ip_nsproxym(proxy) ((ipc_port_t)((unsigned int)(proxy) | 1)) -#endif NORMA_IPC +#endif /* NORMA_IPC */ -#endif _IPC_IPC_PORT_H_ +#endif /* _IPC_IPC_PORT_H_ */ diff --git a/ipc/ipc_pset.c b/ipc/ipc_pset.c index 57705d6..d916f0c 100644 --- a/ipc/ipc_pset.c +++ b/ipc/ipc_pset.c @@ -346,4 +346,4 @@ ipc_pset_print( indent -=2; } -#endif MACH_KDB +#endif /* MACH_KDB */ diff --git a/ipc/ipc_pset.h b/ipc/ipc_pset.h index 23e3e25..e6cdd5b 100644 --- a/ipc/ipc_pset.h +++ b/ipc/ipc_pset.h @@ -92,4 +92,4 @@ ipc_pset_destroy(/* ipc_pset_t */); extern void ipc_pset_print(/* ipc_pset_t */); -#endif _IPC_IPC_PSET_H_ +#endif /* _IPC_IPC_PSET_H_ */ diff --git a/ipc/ipc_right.c b/ipc/ipc_right.c index 54cd99f..72d8cc0 100644 --- a/ipc/ipc_right.c +++ b/ipc/ipc_right.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -221,7 +221,7 @@ ipc_right_dnrequest( previous = IP_NULL; } else -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ previous = ipc_right_dncancel_macro( space, port, name, entry); @@ -263,7 +263,7 @@ ipc_right_dnrequest( entry->ie_request = request; #if MACH_IPC_COMPAT entry->ie_bits = bits &~ IE_BITS_COMPAT; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ is_write_unlock(space); break; } @@ -273,7 +273,7 @@ ipc_right_dnrequest( is_write_unlock(space); return KERN_INVALID_NAME; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ bits = entry->ie_bits; assert(bits & MACH_PORT_TYPE_DEAD_NAME); @@ -346,7 +346,7 @@ ipc_right_dncancel( is_release(space); dnrequest = IP_NULL; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ return dnrequest; } @@ -419,7 +419,7 @@ ipc_right_inuse(space, name, entry) return FALSE; } } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ is_write_unlock(space); return TRUE; @@ -498,7 +498,7 @@ ipc_right_check(space, port, name, entry) return TRUE; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ /* convert entry to dead name */ @@ -727,7 +727,7 @@ ipc_right_destroy( #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) return KERN_INVALID_NAME; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ break; } @@ -843,7 +843,7 @@ ipc_right_dealloc(space, name, entry) #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) goto invalid_name; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ bits = entry->ie_bits; assert(IE_BITS_TYPE(bits) == MACH_PORT_TYPE_DEAD_NAME); @@ -882,7 +882,7 @@ ipc_right_dealloc(space, name, entry) #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) goto invalid_name; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ bits = entry->ie_bits; assert(IE_BITS_TYPE(bits) == MACH_PORT_TYPE_DEAD_NAME); @@ -976,7 +976,7 @@ ipc_right_dealloc(space, name, entry) invalid_name: is_write_unlock(space); return KERN_INVALID_NAME; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ } /* @@ -1086,7 +1086,7 @@ ipc_right_delta(space, name, entry, right, delta) entry->ie_object = IO_NULL; ipc_entry_dealloc(space, name, entry); } else -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ if (bits & MACH_PORT_TYPE_SEND) { assert(IE_BITS_TYPE(bits) == MACH_PORT_TYPE_SEND_RECEIVE); @@ -1152,7 +1152,7 @@ ipc_right_delta(space, name, entry, right, delta) #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) goto invalid_name; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ assert(!(entry->ie_bits & MACH_PORT_TYPE_SEND_ONCE)); goto invalid_right; @@ -1198,7 +1198,7 @@ ipc_right_delta(space, name, entry, right, delta) #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) goto invalid_name; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ bits = entry->ie_bits; } else if ((bits & MACH_PORT_TYPE_DEAD_NAME) == 0) @@ -1250,7 +1250,7 @@ ipc_right_delta(space, name, entry, right, delta) #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) goto invalid_name; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ assert((entry->ie_bits & MACH_PORT_TYPE_SEND) == 0); goto invalid_right; @@ -1337,7 +1337,7 @@ ipc_right_delta(space, name, entry, right, delta) invalid_name: is_write_unlock(space); return KERN_INVALID_NAME; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ } /* @@ -1372,7 +1372,7 @@ ipc_right_info( is_write_unlock(space); return KERN_INVALID_NAME; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ bits = entry->ie_bits; assert(IE_BITS_TYPE(bits) == MACH_PORT_TYPE_DEAD_NAME); @@ -1387,7 +1387,7 @@ ipc_right_info( if (bits & IE_BITS_COMPAT) type |= MACH_PORT_TYPE_COMPAT; else -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ if (request != 0) type |= MACH_PORT_TYPE_DNREQUEST; if (bits & IE_BITS_MAREQUEST) @@ -1449,7 +1449,7 @@ ipc_right_copyin_check( #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) return FALSE; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ break; } @@ -1631,7 +1631,7 @@ ipc_right_copyin( #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) goto invalid_name; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ bits = entry->ie_bits; goto copy_dead; @@ -1678,7 +1678,7 @@ ipc_right_copyin( #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) goto invalid_name; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ bits = entry->ie_bits; goto move_dead; @@ -1754,7 +1754,7 @@ ipc_right_copyin( #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) goto invalid_name; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ bits = entry->ie_bits; goto move_dead; @@ -1834,7 +1834,7 @@ ipc_right_copyin( #if MACH_IPC_COMPAT invalid_name: return KERN_INVALID_NAME; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ } /* @@ -1963,7 +1963,7 @@ ipc_right_copyin_two( #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) goto invalid_name; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ goto invalid_right; } @@ -2017,7 +2017,7 @@ ipc_right_copyin_two( #if MACH_IPC_COMPAT invalid_name: return KERN_INVALID_NAME; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ } /* @@ -2258,7 +2258,7 @@ ipc_right_rename( is_write_unlock(space); return KERN_INVALID_NAME; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ bits = oentry->ie_bits; assert(IE_BITS_TYPE(bits) == MACH_PORT_TYPE_DEAD_NAME); @@ -2759,4 +2759,4 @@ ipc_right_copyin_header(space, name, entry, objectp, msgt_namep) return KERN_INVALID_NAME; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ diff --git a/ipc/ipc_right.h b/ipc/ipc_right.h index 7c0f2a3..f0281e6 100644 --- a/ipc/ipc_right.h +++ b/ipc/ipc_right.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -120,5 +120,5 @@ extern kern_return_t ipc_right_copyin_header(/* ipc_space_t, mach_port_t, ipc_entry_t, ipc_object_t *, mach_msg_type_name_t * */); -#endif MACH_IPC_COMPAT -#endif _IPC_IPC_RIGHT_H_ +#endif /* MACH_IPC_COMPAT */ +#endif /* _IPC_IPC_RIGHT_H_ */ diff --git a/ipc/ipc_space.c b/ipc/ipc_space.c index 7e3cba9..cd40b58 100644 --- a/ipc/ipc_space.c +++ b/ipc/ipc_space.c @@ -61,7 +61,7 @@ ipc_space_t ipc_space_kernel; ipc_space_t ipc_space_reply; #if NORMA_IPC ipc_space_t ipc_space_remote; -#endif NORMA_IPC +#endif /* NORMA_IPC */ /* * Routine: ipc_space_reference @@ -178,7 +178,7 @@ ipc_space_create( ip_unlock(port); space->is_notify = port; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ *spacep = space; return KERN_SUCCESS; @@ -305,7 +305,7 @@ ipc_space_destroy( #if MACH_IPC_COMPAT if (IP_VALID(space->is_notify)) ipc_port_release_send(space->is_notify); -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ /* * Because the space is now dead, diff --git a/ipc/ipc_space.h b/ipc/ipc_space.h index 430971f..e242911 100644 --- a/ipc/ipc_space.h +++ b/ipc/ipc_space.h @@ -82,7 +82,7 @@ struct ipc_space { #if MACH_IPC_COMPAT struct ipc_port *is_notify; /* notification port */ -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ }; #define IS_NULL ((ipc_space_t) 0) @@ -96,7 +96,7 @@ extern struct ipc_space *ipc_space_kernel; extern struct ipc_space *ipc_space_reply; #if NORMA_IPC extern struct ipc_space *ipc_space_remote; -#endif NORMA_IPC +#endif /* NORMA_IPC */ #define is_ref_lock_init(is) simple_lock_init(&(is)->is_ref_lock_data) @@ -160,5 +160,5 @@ void ipc_space_destroy(struct ipc_space *); #define ipc_space_make_notify(space) \ ipc_port_copy_send(space->is_notify) -#endif MACH_IPC_COMPAT -#endif _IPC_IPC_SPACE_H_ +#endif /* MACH_IPC_COMPAT */ +#endif /* _IPC_IPC_SPACE_H_ */ diff --git a/ipc/mach_debug.c b/ipc/mach_debug.c index cd8fad0..49530cf 100644 --- a/ipc/mach_debug.c +++ b/ipc/mach_debug.c @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -383,9 +383,9 @@ mach_port_space_info( iin->iin_collision = (bits & IE_BITS_COLLISION) ? TRUE : FALSE; #if MACH_IPC_COMPAT iin->iin_compat = (bits & IE_BITS_COMPAT) ? TRUE : FALSE; -#else MACH_IPC_COMPAT +#else /* MACH_IPC_COMPAT */ iin->iin_compat = FALSE; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ iin->iin_marequest = (bits & IE_BITS_MAREQUEST) ? TRUE : FALSE; iin->iin_type = IE_BITS_TYPE(bits); iin->iin_urefs = IE_BITS_UREFS(bits); @@ -408,9 +408,9 @@ mach_port_space_info( iin->iin_collision = (bits & IE_BITS_COLLISION) ? TRUE : FALSE; #if MACH_IPC_COMPAT iin->iin_compat = (bits & IE_BITS_COMPAT) ? TRUE : FALSE; -#else MACH_IPC_COMPAT +#else /* MACH_IPC_COMPAT */ iin->iin_compat = FALSE; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ iin->iin_marequest = (bits & IE_BITS_MAREQUEST) ? TRUE : FALSE; iin->iin_type = IE_BITS_TYPE(bits); iin->iin_urefs = IE_BITS_UREFS(bits); diff --git a/ipc/mach_msg.c b/ipc/mach_msg.c index ffcccf4..ab132af 100644 --- a/ipc/mach_msg.c +++ b/ipc/mach_msg.c @@ -641,7 +641,7 @@ mach_msg_trap(msg, option, send_size, rcv_size, rcv_name, time_out, notify) ip_unlock(reply_port); goto norma_send; } -#endif NORMA_IPC +#endif /* NORMA_IPC */ if (dest_port->ip_msgcount >= dest_port->ip_qlimit) goto abort_request_send_receive; @@ -760,7 +760,7 @@ mach_msg_trap(msg, option, send_size, rcv_size, rcv_name, time_out, notify) ip_unlock(dest_port); goto norma_send; } -#endif NORMA_IPC +#endif /* NORMA_IPC */ /* optimized ipc_entry_lookup/ipc_mqueue_copyin */ @@ -861,7 +861,7 @@ mach_msg_trap(msg, option, send_size, rcv_size, rcv_name, time_out, notify) assert(dest_port->ip_receiver != ipc_space_kernel); #if NORMA_IPC assert(! IP_NORMA_IS_PROXY(dest_port)); -#endif NORMA_IPC +#endif /* NORMA_IPC */ assert((dest_port->ip_msgcount < dest_port->ip_qlimit) || (MACH_MSGH_BITS_REMOTE(kmsg->ikm_header.msgh_bits) == MACH_MSG_TYPE_PORT_SEND_ONCE)); @@ -1343,7 +1343,7 @@ mach_msg_trap(msg, option, send_size, rcv_size, rcv_name, time_out, notify) if (ip_active(dest_port) && #if NORMA_IPC (! IP_NORMA_IS_PROXY(dest_port)) && -#endif NORMA_IPC +#endif /* NORMA_IPC */ ((dest_port->ip_msgcount < dest_port->ip_qlimit) || (MACH_MSGH_BITS_REMOTE(kmsg->ikm_header.msgh_bits) == MACH_MSG_TYPE_PORT_SEND_ONCE))) @@ -1400,7 +1400,7 @@ mach_msg_trap(msg, option, send_size, rcv_size, rcv_name, time_out, notify) } goto slow_get_rcv_port; -#endif NORMA_IPC +#endif /* NORMA_IPC */ kernel_send: /* @@ -2276,4 +2276,4 @@ msg_receive_continue() } #endif /* CONTINUATIONS */ -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ diff --git a/ipc/mach_msg.h b/ipc/mach_msg.h index 55c3526..c5dc3ce 100644 --- a/ipc/mach_msg.h +++ b/ipc/mach_msg.h @@ -1,25 +1,25 @@ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * + * * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -64,5 +64,5 @@ mach_msg_interrupt(/* thread_t */); extern void msg_receive_continue(); -#endif MACH_IPC_COMPAT -#endif _IPC_MACH_MSG_H_ +#endif /* MACH_IPC_COMPAT */ +#endif /* _IPC_MACH_MSG_H_ */ diff --git a/ipc/mach_port.c b/ipc/mach_port.c index b26c96b..6dc83ad 100644 --- a/ipc/mach_port.c +++ b/ipc/mach_port.c @@ -105,7 +105,7 @@ mach_port_names_helper( #if MACH_IPC_COMPAT if (bits & IE_BITS_COMPAT) return; -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ /* pretend this is a dead-name entry */ @@ -122,7 +122,7 @@ mach_port_names_helper( if (bits & IE_BITS_COMPAT) type |= MACH_PORT_TYPE_COMPAT; else -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ if (request != 0) type |= MACH_PORT_TYPE_DNREQUEST; if (bits & IE_BITS_MAREQUEST) @@ -1239,7 +1239,7 @@ mach_port_request_notification( ipc_port_release_send(ip_pdsend(previous)); previous = IP_NULL; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ *previousp = previous; break; @@ -2502,4 +2502,4 @@ port_extract_receive(space, name, portp) return kr; } -#endif MACH_IPC_COMPAT +#endif /* MACH_IPC_COMPAT */ |