From: Jeff Trawick <trawick@apache.org>
Date: Tue, 6 Feb 2001 15:52:27 +0000 (+0000)
Subject: axe an unused parm to make_child(); this gets rid of a warning
X-Git-Tag: APACHE_2_0_2001_02_09~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b84240987b3576d067e0d0e266886393146eb11;p=apache

axe an unused parm to make_child(); this gets rid of a warning
on AIX about not having a prototype for time()


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

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index ef826cdd9b..172585b88c 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -820,7 +820,7 @@ static void child_main(int child_num_arg)
 }
 
 
-static int make_child(server_rec *s, int slot, time_t now)
+static int make_child(server_rec *s, int slot)
 {
     int pid;
 
@@ -903,13 +903,12 @@ static int make_child(server_rec *s, int slot, time_t now)
 static void startup_children(int number_to_start)
 {
     int i;
-    time_t now = time(0);
 
     for (i = 0; number_to_start && i < ap_daemons_limit; ++i) {
 	if (ap_scoreboard_image->servers[i][0].status != SERVER_DEAD) {
 	    continue;
 	}
-	if (make_child(ap_server_conf, i, now) < 0) {
+	if (make_child(ap_server_conf, i) < 0) {
 	    break;
 	}
 	--number_to_start;
@@ -935,7 +934,6 @@ static void perform_idle_server_maintenance(void)
     int to_kill;
     int idle_count;
     short_score *ss;
-    time_t now = time(0);
     int free_length;
     int free_slots[MAX_SPAWN_RATE];
     int last_non_dead;
@@ -1020,7 +1018,7 @@ static void perform_idle_server_maintenance(void)
 	    }
 	    for (i = 0; i < free_length; ++i) {
 #ifdef TPF
-        if(make_child(ap_server_conf, free_slots[i], now) == -1) {
+        if (make_child(ap_server_conf, free_slots[i]) == -1) {
             if(free_length == 1) {
                 shutdown_pending = 1;
                 ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, ap_server_conf,
@@ -1028,7 +1026,7 @@ static void perform_idle_server_maintenance(void)
             }
         }
 #else
-		make_child(ap_server_conf, free_slots[i], now);
+		make_child(ap_server_conf, free_slots[i]);
 #endif /* TPF */
 	    }
 	    /* the next time around we want to spawn twice as many if this
@@ -1159,7 +1157,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
 		    /* we're still doing a 1-for-1 replacement of dead
 			* children with new children
 			*/
-		    make_child(ap_server_conf, child_slot, time(0));
+		    make_child(ap_server_conf, child_slot);
 		    --remaining_children_to_start;
 		}
 #if APR_HAS_OTHER_CHILD