You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2016/04/02 00:59:21 UTC

svn commit: r1737451 - /httpd/httpd/trunk/server/mpm/worker/worker.c

Author: ylavic
Date: Fri Apr  1 22:59:21 2016
New Revision: 1737451

URL: http://svn.apache.org/viewvc?rev=1737451&view=rev
Log:
mpm_worker: follow up to r1737449.
Same spurious (duplicated) local variable removal, this time for mpm_worker.

Modified:
    httpd/httpd/trunk/server/mpm/worker/worker.c

Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=1737451&r1=1737450&r2=1737451&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Fri Apr  1 22:59:21 2016
@@ -1045,8 +1045,7 @@ static void * APR_THREAD_FUNC start_thre
     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_thre
     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;