o Correct a debug message that refered to the wrong function

o Remove an unncecesary if clause

Approved by:	markm (mentor)(implicit)
Reviewd by:	jeff

2 files changed, 20 insertions, 23 deletions

diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c
index 67b137d..af7d505 100644
--- a/lib/libthr/thread/thr_mutex.c
+++ b/lib/libthr/thread/thr_mutex.c
@@ -471,7 +471,7 @@ mutex_lock_common(pthread_mutex_t * mutex)
 	int	ret = 0;
 
 	PTHREAD_ASSERT((mutex != NULL) && (*mutex != NULL),
-	    "Uninitialized mutex in pthread_mutex_trylock_basic");
+	    "Uninitialized mutex in mutex_lock_common");
 
 	/*
 	 * Enter a loop waiting to become the mutex owner.  We need a
diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c
index dfd488d..d21886e 100644
--- a/lib/libthr/thread/thr_sig.c
+++ b/lib/libthr/thread/thr_sig.c
@@ -124,28 +124,25 @@ _thread_sig_wrapper(int sig, siginfo_t *info, ucontext_t *context)
 	curthread->state = psd.psd_state;
 	curthread->flags = psd.psd_flags;
 
-	/* Check the threads previous state: */
-	if (psd.psd_state != PS_RUNNING) {
-		/*
-		 * Do a little cleanup handling for those threads in
-		 * queues before calling the signal handler.  Signals
-		 * for these threads are temporarily blocked until
-		 * after cleanup handling.
-		 */
-		switch (psd.psd_state) {
-		case PS_COND_WAIT:
-			_cond_wait_backout(curthread);
-			psd.psd_state = PS_RUNNING;
-			break;
-
-		case PS_MUTEX_WAIT:
-			/* _mutex_lock_backout(curthread); XXXTHR */
-			psd.psd_state = PS_RUNNING;
-			break;
-
-		default:
-			break;
-		}
+	/*
+	 * Do a little cleanup handling for those threads in
+	 * queues before calling the signal handler.  Signals
+	 * for these threads are temporarily blocked until
+	 * after cleanup handling.
+	 */
+	switch (psd.psd_state) {
+	case PS_COND_WAIT:
+		_cond_wait_backout(curthread);
+		psd.psd_state = PS_RUNNING;
+		break;
+
+	case PS_MUTEX_WAIT:
+		/* _mutex_lock_backout(curthread); XXXTHR */
+		psd.psd_state = PS_RUNNING;
+		break;
+
+	default:
+		break;
 	}
 
 	if (_thread_sigact[sig -1].sa_handler != NULL) {