From: Aaron Bannert <aaron@apache.org>
Date: Thu, 27 Dec 2001 17:06:40 +0000 (+0000)
Subject: Take advantage of the new usable apr_thread_exit().
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d12e1f7a6d563831a93ec6ccdbf1ad050d756b5;p=apache

Take advantage of the new usable apr_thread_exit().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92622 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index aeebad24ba..4978e95a3d 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -750,9 +750,7 @@ static void *listener_thread(apr_thread_t *thd, void * dummy)
     ap_scoreboard_image->parent[process_slot].quiescing = 1;
     kill(ap_my_pid, SIGTERM);
 
-/* Unsure if this can be safely uncommented. -aaron
     apr_thread_exit(thd, APR_SUCCESS);
-*/
     return NULL;
 }
 
@@ -789,8 +787,7 @@ static void *worker_thread(apr_thread_t *thd, void * dummy)
     worker_thread_count--;
     apr_thread_mutex_unlock(worker_thread_count_mutex);
 
-    rv = APR_SUCCESS;
-    apr_thread_exit(thd, &rv);
+    apr_thread_exit(thd, APR_SUCCESS);
     return NULL;
 }
 
@@ -879,8 +876,7 @@ static void *start_threads(apr_thread_t *thd, void *dummy)
      *  "life_status" is almost right, but it's in the worker's structure, and 
      *  the name could be clearer.   gla
      */
-    rv = APR_SUCCESS;
-    apr_thread_exit(thd, &rv);
+    apr_thread_exit(thd, APR_SUCCESS);
     return NULL;
 }