X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/43866e378188c25dd1e2208016ab3cbeb086ae6c..0c530ab8987f0ae6a1a3d9284f40182b88852816:/osfmk/ipc/ipc_hash.c

diff --git a/osfmk/ipc/ipc_hash.c b/osfmk/ipc/ipc_hash.c
index 0c45f2441..46462a593 100644
--- a/osfmk/ipc/ipc_hash.c
+++ b/osfmk/ipc/ipc_hash.c
@@ -1,24 +1,21 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -214,8 +211,7 @@ typedef struct ipc_hash_global_bucket {
 
 #define	IHGB_NULL	((ipc_hash_global_bucket_t) 0)
 
-#define	ihgb_lock_init(ihgb)	mutex_init(&(ihgb)->ihgb_lock_data, \
-					   ETAP_IPC_IHGB)
+#define	ihgb_lock_init(ihgb)	mutex_init(&(ihgb)->ihgb_lock_data, 0)
 #define	ihgb_lock(ihgb)		mutex_lock(&(ihgb)->ihgb_lock_data)
 #define	ihgb_unlock(ihgb)	mutex_unlock(&(ihgb)->ihgb_lock_data)
 
@@ -287,17 +283,14 @@ ipc_hash_global_lookup(
 
 void
 ipc_hash_global_insert(
-	ipc_space_t			space,
-	ipc_object_t			obj,
-	mach_port_name_t		name,
-	ipc_tree_entry_t		entry)
+	ipc_space_t				space,
+	ipc_object_t				obj,
+	__assert_only mach_port_name_t	name,
+	ipc_tree_entry_t			entry)
 {
 	ipc_hash_global_bucket_t bucket;
 
-
 	assert(!is_fast_space(space));
-
-
 	assert(entry->ite_name == name);
 	assert(space != IS_NULL);
 	assert(entry->ite_space == space);
@@ -328,16 +321,15 @@ ipc_hash_global_insert(
 
 void
 ipc_hash_global_delete(
-	ipc_space_t			space,
-	ipc_object_t			obj,
-	mach_port_name_t		name,
-	ipc_tree_entry_t		entry)
+	ipc_space_t				space,
+	ipc_object_t				obj,
+	__assert_only mach_port_name_t	name,
+	ipc_tree_entry_t			entry)
 {
 	ipc_hash_global_bucket_t bucket;
 	ipc_tree_entry_t this, *last;
 
 	assert(!is_fast_space(space));
-
 	assert(entry->ite_name == name);
 	assert(space != IS_NULL);
 	assert(entry->ite_space == space);
@@ -460,10 +452,10 @@ ipc_hash_local_lookup(
 
 void
 ipc_hash_local_insert(
-	ipc_space_t		space,
-	ipc_object_t		obj,
-	mach_port_index_t	index,
-	ipc_entry_t		entry)
+	ipc_space_t			space,
+	ipc_object_t			obj,
+	mach_port_index_t		index,
+	__assert_only ipc_entry_t	entry)
 {
 	ipc_entry_t table;
 	ipc_entry_num_t size;
@@ -504,10 +496,10 @@ ipc_hash_local_insert(
 
 void
 ipc_hash_local_delete(
-	ipc_space_t		space,
-	ipc_object_t		obj,
-	mach_port_index_t	index,
-	ipc_entry_t		entry)
+	ipc_space_t			space,
+	ipc_object_t			obj,
+	mach_port_index_t		index,
+	__assert_only ipc_entry_t	entry)
 {
 	ipc_entry_t table;
 	ipc_entry_num_t size;