From b42bd0d675ec7d1e1fbbf274fadbea984c8dab22 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 5 Apr 2001 06:39:21 +0000 Subject: 2001-04-04 Roland McGrath * ddb/db_access.h: Fix obsolescent #else/#endif syntax. * ddb/db_aout.c: Likewise. * ddb/db_break.c: Likewise. * ddb/db_break.h: Likewise. * ddb/db_command.c: Likewise. * ddb/db_command.h: Likewise. * ddb/db_cond.c: Likewise. * ddb/db_examine.c: Likewise. * ddb/db_expr.c: Likewise. * ddb/db_ext_symtab.c: Likewise. * ddb/db_input.c: Likewise. * ddb/db_lex.c: Likewise. * ddb/db_macro.c: Likewise. * ddb/db_mp.c: Likewise. * ddb/db_output.c: Likewise. * ddb/db_print.c: Likewise. * ddb/db_run.c: Likewise. * ddb/db_sym.c: Likewise. * ddb/db_task_thread.c: Likewise. * ddb/db_task_thread.h: Likewise. * ddb/db_trap.c: Likewise. * ddb/db_variables.c: Likewise. * ddb/db_watch.c: Likewise. * ddb/db_watch.h: Likewise. * ddb/db_write_cmd.c: Likewise. * device/dev_pager.c: Likewise. * device/device_port.h: Likewise. * device/device_types_kernel.h: Likewise. * device/ds_routines.h: Likewise. * device/errno.h: Likewise. * device/if_ether.h: Likewise. * device/if_hdr.h: Likewise. * device/io_req.h: Likewise. * device/net_io.c: Likewise. * device/net_io.h: Likewise. * i386/i386/ast_check.c: Likewise. * i386/i386/cswitch.S: Likewise. * i386/i386/db_disasm.c: Likewise. * i386/i386/db_interface.c: Likewise. * i386/i386/db_trace.c: Likewise. * i386/i386/debug.h: Likewise. * i386/i386/debug_i386.c: Likewise. * i386/i386/debug_trace.S: Likewise. * i386/i386/eflags.h: Likewise. * i386/i386/gdt.h: Likewise. * i386/i386/hardclock.c: Likewise. * i386/i386/idt-gen.h: Likewise. * i386/i386/ipl.h: Likewise. * i386/i386/ktss.h: Likewise. * i386/i386/kttd_interface.c: Likewise. * i386/i386/ldt.h: Likewise. * i386/i386/lock.h: Likewise. * i386/i386/locore.S: Likewise. * i386/i386/mp_desc.h: Likewise. * i386/i386/pic.c: Likewise. * i386/i386/pic.h: Likewise. * i386/i386/pio.h: Likewise. * i386/i386/pit.h: Likewise. * i386/i386/seg.h: Likewise. * i386/i386/thread.h: Likewise. * i386/i386/trap.c: Likewise. * i386/i386/trap.h: Likewise. * i386/i386/vm_param.h: Likewise. * i386/i386/vm_tuning.h: Likewise. * i386/i386at/autoconf.c: Likewise. * i386/i386at/blit.c: Likewise. * i386/i386at/conf.c: Likewise. * i386/i386at/fd.c: Likewise. * i386/i386at/idt.h: Likewise. * i386/i386at/immc.c: Likewise. * i386/i386at/kd.c: Likewise. * i386/i386at/kd_event.c: Likewise. * i386/i386at/kd_mouse.c: Likewise. * i386/i386at/model_dep.c: Likewise. * i386/i386at/rtc.c: Likewise. * i386/include/mach/i386/asm.h: Likewise. * i386/include/mach/i386/eflags.h: Likewise. * i386/include/mach/i386/mach_i386.defs: Likewise. * i386/include/mach/i386/multiboot.h: Likewise. * i386/include/mach/i386/trap.h: Likewise. * i386/include/mach/i386/vm_types.h: Likewise. * i386/include/mach/sa/stdarg.h: Likewise. * i386/intel/pmap.c: Likewise. * i386/intel/pmap.h: Likewise. * include/alloca.h: Likewise. * include/device/device_types.defs: Likewise. * include/device/device_types.h: Likewise. * include/device/disk_status.h: Likewise. * include/device/net_status.h: Likewise. * include/mach/mach.defs: Likewise. * include/mach/memory_object.defs: Likewise. * include/mach/std_types.defs: Likewise. * include/mach_debug/hash_info.h: Likewise. * include/mach_debug/ipc_info.h: Likewise. * include/mach_debug/mach_debug.defs: Likewise. * include/mach_debug/mach_debug_types.defs: Likewise. * include/mach_debug/mach_debug_types.h: Likewise. * include/mach_debug/vm_info.h: Likewise. * include/mach_debug/zone_info.h: Likewise. * include/sys/ioctl.h: Likewise. * include/sys/time.h: Likewise. * ipc/ipc_entry.h: Likewise. * ipc/ipc_hash.h: Likewise. * ipc/ipc_init.c: Likewise. * ipc/ipc_kmsg.c: Likewise. * ipc/ipc_kmsg.h: Likewise. * ipc/ipc_marequest.c: Likewise. * ipc/ipc_marequest.h: Likewise. * ipc/ipc_mqueue.c: Likewise. * ipc/ipc_mqueue.h: Likewise. * ipc/ipc_notify.c: Likewise. * ipc/ipc_notify.h: Likewise. * ipc/ipc_object.c: Likewise. * ipc/ipc_object.h: Likewise. * ipc/ipc_port.c: Likewise. * ipc/ipc_port.h: Likewise. * ipc/ipc_pset.c: Likewise. * ipc/ipc_pset.h: Likewise. * ipc/ipc_right.c: Likewise. * ipc/ipc_right.h: Likewise. * ipc/ipc_space.c: Likewise. * ipc/ipc_space.h: Likewise. * ipc/mach_debug.c: Likewise. * ipc/mach_msg.c: Likewise. * ipc/mach_msg.h: Likewise. * ipc/mach_port.c: Likewise. * kern/act.c: Likewise. * kern/assert.h: Likewise. * kern/ast.c: Likewise. * kern/ast.h: Likewise. * kern/bootstrap.c: Likewise. * kern/counters.c: Likewise. * kern/counters.h: Likewise. * kern/debug.h: Likewise. * kern/exception.c: Likewise. * kern/host.h: Likewise. * kern/ipc_host.c: Likewise. * kern/ipc_host.h: Likewise. * kern/ipc_kobject.c: Likewise. * kern/ipc_mig.c: Likewise. * kern/ipc_tt.c: Likewise. * kern/ipc_tt.h: Likewise. * kern/kalloc.h: Likewise. * kern/lock_mon.c: Likewise. * kern/mach_clock.c: Likewise. * kern/mach_factor.c: Likewise. * kern/mach_param.h: Likewise. * kern/machine.c: Likewise. * kern/processor.c: Likewise. * kern/profile.c: Likewise. * kern/queue.h: Likewise. * kern/sched.h: Likewise. * kern/startup.c: Likewise. * kern/syscall_emulation.h: Likewise. * kern/syscall_subr.c: Likewise. * kern/syscall_subr.h: Likewise. * kern/syscall_sw.c: Likewise. * kern/syscall_sw.h: Likewise. * kern/task.h: Likewise. * kern/thread_swap.h: Likewise. * kern/time_out.h: Likewise. * kern/time_stamp.c: Likewise. * kern/time_stamp.h: Likewise. * kern/timer.c: Likewise. * kern/timer.h: Likewise. * kern/xpr.c: Likewise. * kern/xpr.h: Likewise. * kern/zalloc.c: Likewise. * kern/zalloc.h: Likewise. * linux/dev/drivers/block/ide.c: Likewise. * linux/dev/include/linux/blk.h: Likewise. * linux/src/include/linux/cdrom.h: Likewise. * linux/src/include/linux/md.h: Likewise. * util/cpu.h: Likewise. * vm/memory_object.c: Likewise. * vm/memory_object.h: Likewise. * vm/pmap.h: Likewise. * vm/vm_debug.c: Likewise. * vm/vm_external.h: Likewise. * vm/vm_fault.c: Likewise. * vm/vm_fault.h: Likewise. * vm/vm_kern.h: Likewise. * vm/vm_map.c: Likewise. * vm/vm_map.h: Likewise. * vm/vm_object.h: Likewise. * vm/vm_pageout.c: Likewise. * vm/vm_pageout.h: Likewise. * vm/vm_user.h: Likewise. --- ipc/ipc_right.c | 64 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'ipc/ipc_right.c') diff --git a/ipc/ipc_right.c b/ipc/ipc_right.c index 54cd99f5..72d8cc0f 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 */ -- cgit v1.2.3