]> granicus.if.org Git - apache/commitdiff
mpm_worker: follow up to r1737449.
authorYann Ylavic <ylavic@apache.org>
Fri, 1 Apr 2016 22:59:21 +0000 (22:59 +0000)
committerYann Ylavic <ylavic@apache.org>
Fri, 1 Apr 2016 22:59:21 +0000 (22:59 +0000)
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

server/mpm/worker/worker.c

index 5b87112a4cc73e7b64dc503d0596c49354638e9b..045c57545c82f83e63f8986577f43f5889fce9a8 100644 (file)
@@ -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;