httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm/mpmt_pthread mpmt_pthread.c scoreboard.c
Date Tue, 23 May 2000 14:05:54 GMT
trawick     00/05/23 07:05:53

  Modified:    src/modules/mpm/mpmt_pthread mpmt_pthread.c scoreboard.c
  Log:
  Clean up some pid_t vs. int confusion in mpmt_pthread MPM.  This is
  needed to avoid some warnings on Solaris.
  
  Revision  Changes    Path
  1.75      +8 -8      apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c
  
  Index: mpmt_pthread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/mpmt_pthread.c,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- mpmt_pthread.c	2000/05/19 07:14:50	1.74
  +++ mpmt_pthread.c	2000/05/23 14:05:52	1.75
  @@ -377,7 +377,7 @@
   
   static void process_child_status(ap_proc_t *abs_pid, ap_wait_t status)
   {
  -    int pid;
  +    pid_t pid;
       ap_get_os_proc(&pid, abs_pid);
       /* Child died... if it died due to a fatal error,
   	* we should simply bail out.
  @@ -385,9 +385,9 @@
       if ((WIFEXITED(status)) &&
   	WEXITSTATUS(status) == APEXIT_CHILDFATAL) {
   	ap_log_error(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, 0, ap_server_conf,
  -			"Child %d returned a Fatal error... \n"
  +			"Child %ld returned a Fatal error... \n"
   			"Apache is exiting!",
  -			pid);
  +			(long)pid);
   	exit(APEXIT_CHILDFATAL);
       }
       if (WIFSIGNALED(status)) {
  @@ -403,9 +403,9 @@
   	    if (WCOREDUMP(status)) {
   		ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE,
   			     0, ap_server_conf,
  -			     "child pid %d exit signal %s (%d), "
  +			     "child pid %ld exit signal %s (%d), "
   			     "possible coredump in %s",
  -			     pid, (WTERMSIG(status) >= NumSIG) ? "" : 
  +			     (long)pid, (WTERMSIG(status) >= NumSIG) ? "" : 
   			     SYS_SIGLIST[WTERMSIG(status)], WTERMSIG(status),
   			     ap_coredump_dir);
   	    }
  @@ -413,7 +413,7 @@
   #endif
   		ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE,
   			     0, ap_server_conf,
  -			     "child pid %d exit signal %s (%d)", pid,
  +			     "child pid %ld exit signal %s (%d)", (long)pid,
   			     SYS_SIGLIST[WTERMSIG(status)], WTERMSIG(status));
   #ifdef WCOREDUMP
   	    }
  @@ -421,8 +421,8 @@
   #else
   	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE,
   			 ap_server_conf,
  -			 "child pid %d exit signal %d",
  -			 pid, WTERMSIG(status));
  +			 "child pid %ld exit signal %d",
  +			 (long)pid, WTERMSIG(status));
   #endif
   	}
       }
  
  
  
  1.26      +1 -1      apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c
  
  Index: scoreboard.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/scoreboard.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- scoreboard.c	2000/05/19 22:39:00	1.25
  +++ scoreboard.c	2000/05/23 14:05:53	1.26
  @@ -206,7 +206,7 @@
   API_EXPORT(int) find_child_by_pid(ap_proc_t *pid)
   {
       int i;
  -    int actual_pid;
  +    pid_t actual_pid;
   
       int max_daemons_limit = ap_get_max_daemons();
       ap_get_os_proc(&actual_pid, pid);
  
  
  

Mime
View raw message