2008-01-23 Joel Sherrill <joel.sherrill@oarcorp.com>

	* score/src/threadblockingoperationcancel.c: Clean up.
	* score/src/threadqextract.c: Restructure to eliminate dead code.

1 files changed, 5 insertions, 1 deletions

diff --git a/cpukit/score/src/threadblockingoperationcancel.c b/cpukit/score/src/threadblockingoperationcancel.c
index b2b7a22745..82366af144 100644
--- a/cpukit/score/src/threadblockingoperationcancel.c
+++ b/cpukit/score/src/threadblockingoperationcancel.c
@@ -54,12 +54,16 @@ void _Thread_blocking_operation_Cancel(
   #endif
 
   /*
+   * The thread is not waiting on anything after this completes.
+   */
+  the_thread->Wait.queue = NULL;
+
+  /*
    *  If the sync state is timed out, this is very likely not needed.
    *  But better safe than sorry when it comes to critical sections.
    */
   if ( _Watchdog_Is_active( &the_thread->Timer ) ) {
     _Watchdog_Deactivate( &the_thread->Timer );
-    the_thread->Wait.queue = NULL;
     _ISR_Enable( level );
     (void) _Watchdog_Remove( &the_thread->Timer );
   } else