X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/6601e61aa18bf4f09af135ff61fc7f4771d23b06..d41d1dae2cd00cc08c7982087d1c445180cad9f5:/osfmk/kern/queue.h

diff --git a/osfmk/kern/queue.h b/osfmk/kern/queue.h
index 98effaac4..d0bab0c61 100644
--- a/osfmk/kern/queue.h
+++ b/osfmk/kern/queue.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * 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. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -140,7 +146,7 @@ extern void		insque(
 				queue_entry_t	pred);
 
 /* Dequeue element */
-extern int		remque(
+extern void		remque(
 				queue_entry_t elt);
 
 __END_DECLS
@@ -219,14 +225,12 @@ insque(
 	pred->next = entry;
 }
 
-static __inline__ integer_t
+static __inline__ void
 remque(
 	register queue_entry_t elt)
 {
 	(elt->next)->prev = elt->prev;
 	(elt->prev)->next = elt->next;
-
-	return((integer_t)elt);
 }
 
 #endif	/* !__GNUC__ */
@@ -482,6 +486,9 @@ MACRO_BEGIN							\
 		(head)->next = __next;				\
 	else							\
 		((type)__prev)->field.next = __next;		\
+								\
+	(elt)->field.next = NULL;				\
+	(elt)->field.prev = NULL;				\
 MACRO_END
 
 /*
@@ -505,6 +512,9 @@ MACRO_BEGIN							\
 	else							\
 		((type)(__next))->field.prev = (head);		\
 	(head)->next = __next;					\
+								\
+	(entry)->field.next = NULL;				\
+	(entry)->field.prev = NULL;				\
 MACRO_END
 
 /*
@@ -528,6 +538,9 @@ MACRO_BEGIN							\
 	else							\
 		((type)(__prev))->field.next = (head);		\
 	(head)->prev = __prev;					\
+								\
+	(entry)->field.next = NULL;				\
+	(entry)->field.prev = NULL;				\
 MACRO_END
 
 /*