From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 1 Apr 2016 22:59:21 +0000 (+0000)
Subject: mpm_worker: follow up to r1737449.
X-Git-Tag: 2.5.0-alpha~1793
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2c1d8931b98bb2adef89f7c8a1fe42b28cc3dea;p=thirdparty%2Fapache%2Fhttpd.git

mpm_worker: follow up to r1737449.
Same spurious (duplicated) local variable removal, this time for mpm_worker.

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

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 5b87112a4cc..045c57545c8 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1045,8 +1045,7 @@ static void * APR_THREAD_FUNC start_threads(apr_thread_t *thd, void *dummy)
     thread_starter *ts = dummy;
     apr_thread_t **threads = ts->threads;
     apr_threadattr_t *thread_attr = ts->threadattr;
-    int child_num_arg = ts->child_num_arg;
-    int my_child_num = child_num_arg;
+    int my_child_num = ts->child_num_arg;
     proc_info *my_info;
     apr_status_t rv;
     int i;
@@ -1080,7 +1079,7 @@ static void * APR_THREAD_FUNC start_threads(apr_thread_t *thd, void *dummy)
     while (1) {
         /* threads_per_child does not include the listener thread */
         for (i = 0; i < threads_per_child; i++) {
-            int status = ap_scoreboard_image->servers[child_num_arg][i].status;
+            int status = ap_scoreboard_image->servers[my_child_num][i].status;
 
             if (status != SERVER_GRACEFUL && status != SERVER_DEAD) {
                 continue;