xnu-1504.9.26.tar.gz

[apple/xnu.git] / osfmk / kern / queue.h

diff --git a/osfmk/kern/queue.h b/osfmk/kern/queue.h
index ca0f91eaf390341024b053109312da67b08c6ac9..d0bab0c61c37385cc931cc9d20f8e1ac2c7d9958 100644 (file)
--- a/osfmk/kern/queue.h
+++ b/osfmk/kern/queue.h
@@ -146,7 +146,7 @@ extern void         insque(
                                queue_entry_t   pred);
 
 /* Dequeue element */
-extern int             remque(
+extern void            remque(
                                queue_entry_t elt);
 
 __END_DECLS
@@ -225,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__ */
@@ -488,6 +486,9 @@ MACRO_BEGIN                                                 \
                (head)->next = __next;                          \
        else                                                    \
                ((type)__prev)->field.next = __next;            \
+                                                               \
+       (elt)->field.next = NULL;                               \
+       (elt)->field.prev = NULL;                               \
 MACRO_END
 
 /*
@@ -511,6 +512,9 @@ MACRO_BEGIN                                                 \
        else                                                    \
                ((type)(__next))->field.prev = (head);          \
        (head)->next = __next;                                  \
+                                                               \
+       (entry)->field.next = NULL;                             \
+       (entry)->field.prev = NULL;                             \
 MACRO_END
 
 /*
@@ -534,6 +538,9 @@ MACRO_BEGIN                                                 \
        else                                                    \
                ((type)(__prev))->field.next = (head);          \
        (head)->prev = __prev;                                  \
+                                                               \
+       (entry)->field.next = NULL;                             \
+       (entry)->field.prev = NULL;                             \
 MACRO_END
 
 /*