From: Jeff Trawick <trawick@apache.org>
Date: Wed, 1 Sep 2010 12:10:11 +0000 (+0000)
Subject: running_gen was only set to an interesting value on a path
X-Git-Tag: 2.3.9~522
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3084223f38e9600e9437c03d152278776ebc1893;p=apache

running_gen was only set to an interesting value on a path
where it wasn't used before returning from the function; axe it


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

diff --git a/server/scoreboard.c b/server/scoreboard.c
index 2bd91143b0..94aa371d13 100644
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -315,7 +315,6 @@ apr_status_t ap_cleanup_scoreboard(void *d)
  */
 int ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e sb_type)
 {
-    int running_gen = 0;
     int i;
 #if APR_HAS_SHARED_MEMORY
     apr_status_t rv;
@@ -324,7 +323,6 @@ int ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e sb_type)
     pfn_ap_logio_get_last_bytes = APR_RETRIEVE_OPTIONAL_FN(ap_logio_get_last_bytes);
 
     if (ap_scoreboard_image) {
-        running_gen = ap_scoreboard_image->global->running_generation;
         ap_scoreboard_image->global->restart_time = apr_time_now();
         memset(ap_scoreboard_image->parent, 0,
                sizeof(process_score) * server_limit);
@@ -366,7 +364,7 @@ int ap_create_scoreboard(apr_pool_t *p, ap_scoreboard_e sb_type)
     }
 
     ap_scoreboard_image->global->sb_type = sb_type;
-    ap_scoreboard_image->global->running_generation = running_gen;
+    ap_scoreboard_image->global->running_generation = 0;
     ap_scoreboard_image->global->restart_time = apr_time_now();
 
     apr_pool_cleanup_register(p, NULL, ap_cleanup_scoreboard, apr_pool_cleanup_null);