httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/prefork prefork.c
Date Tue, 06 Feb 2001 15:52:32 GMT
trawick     01/02/06 07:52:31

  Modified:    server/mpm/prefork prefork.c
  Log:
  axe an unused parm to make_child(); this gets rid of a warning
  on AIX about not having a prototype for time()
  
  Revision  Changes    Path
  1.153     +5 -7      httpd-2.0/server/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/prefork/prefork.c,v
  retrieving revision 1.152
  retrieving revision 1.153
  diff -u -r1.152 -r1.153
  --- prefork.c	2001/02/04 03:12:48	1.152
  +++ prefork.c	2001/02/06 15:52:27	1.153
  @@ -820,7 +820,7 @@
   }
   
   
  -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 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 @@
       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 @@
   	    }
   	    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 @@
               }
           }
   #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 @@
   		    /* 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
  
  
  

Mime
View raw message