Unexpand TAILQ_FIRST(foo) == NULL to TAILQ_EMPTY.

Ok'ed by:	davidxu

2 files changed, 5 insertions, 5 deletions

diff --git a/lib/libpthread/thread/thr_cond.c b/lib/libpthread/thread/thr_cond.c
index fc86378..e39ae63 100644
--- a/lib/libpthread/thread/thr_cond.c
+++ b/lib/libpthread/thread/thr_cond.c
@@ -336,7 +336,7 @@ _pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
 						    curthread);
 
 						/* Check for no more waiters: */
-						if (TAILQ_FIRST(&(*cond)->c_queue) == NULL)
+						if (TAILQ_EMPTY(&(*cond)->c_queue))
 							(*cond)->c_mutex = NULL;
 					}
 				}
@@ -536,7 +536,7 @@ _pthread_cond_timedwait(pthread_cond_t * cond, pthread_mutex_t * mutex,
 						    curthread);
 
 						/* Check for no more waiters: */
-						if (TAILQ_FIRST(&(*cond)->c_queue) == NULL)
+						if (TAILQ_EMPTY(&(*cond)->c_queue))
 							(*cond)->c_mutex = NULL;
 					}
 
@@ -631,7 +631,7 @@ _pthread_cond_signal(pthread_cond_t * cond)
 					kse_wakeup(kmbx);
 			}
 			/* Check for no more waiters: */
-			if (TAILQ_FIRST(&(*cond)->c_queue) == NULL)
+			if (TAILQ_EMPTY(&(*cond)->c_queue))
 				(*cond)->c_mutex = NULL;
 			break;
 
@@ -758,7 +758,7 @@ cond_wait_backout(void *arg)
 			cond_queue_remove(cond, curthread);
 
 			/* Check for no more waiters: */
-			if (TAILQ_FIRST(&cond->c_queue) == NULL)
+			if (TAILQ_EMPTY(&cond->c_queue))
 				cond->c_mutex = NULL;
 			break;
 
diff --git a/lib/libpthread/thread/thr_mutex.c b/lib/libpthread/thread/thr_mutex.c
index 39e36ff..6383cd8 100644
--- a/lib/libpthread/thread/thr_mutex.c
+++ b/lib/libpthread/thread/thr_mutex.c
@@ -269,7 +269,7 @@ _pthread_mutex_destroy(pthread_mutex_t *mutex)
 		 * Check to see if this mutex is in use:
 		 */
 		if (((*mutex)->m_owner != NULL) ||
-		    (TAILQ_FIRST(&(*mutex)->m_queue) != NULL) ||
+		    (!TAILQ_EMPTY(&(*mutex)->m_queue)) ||
 		    ((*mutex)->m_refcount != 0)) {
 			ret = EBUSY;