2008-05-27 Neal H. Walfield <neal@gnu.org>

	* pthread/pt-internal.h (__pthread_queue_iterate): Before
	returning the current element, save its next pointer.
	(__pthread_dequeuing_iterate): Likewise.

1 files changed, 13 insertions, 6 deletions

diff --git a/pthread/pt-internal.h b/pthread/pt-internal.h
index efd4ffb..5583dfc 100644
--- a/pthread/pt-internal.h
+++ b/pthread/pt-internal.h
@@ -114,15 +114,22 @@ __pthread_dequeue (struct __pthread *thread)
 }
 
 /* Iterate over QUEUE storing each element in ELEMENT.  */
-#define __pthread_queue_iterate(queue, element) \
-	for (element = queue; element; element = element->next)
+#define __pthread_queue_iterate(queue, element)				\
+  for (struct __pthread *__pdi_next = (queue);				\
+       ((element) = __pdi_next)						\
+	 && ((__pdi_next = __pdi_next->next),				\
+	     true);							\
+       )
 
 /* Iterate over QUEUE dequeuing each element, storing it in
    ELEMENT.  */
-#define __pthread_dequeuing_iterate(queue, element) \
-	for (element = queue; \
-	     element && ((element->prevp = 0), 1); \
-	     element = element->next)
+#define __pthread_dequeuing_iterate(queue, element)			\
+  for (struct __pthread *__pdi_next = (queue);				\
+       ((element) = __pdi_next)						\
+	 && ((__pdi_next = __pdi_next->next),				\
+	     ((element)->prevp = 0),					\
+	     true);							\
+       )
 
 /* The total number of threads currently active.  */
 extern __atomic_t __pthread_total;