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/prefork prefork.c
Date Wed, 24 May 2000 20:01:20 GMT
trawick     00/05/24 13:01:19

  Modified:    src/modules/mpm/prefork prefork.c
  Log:
  Clear up some int vs. pid_t issues in prefork to keep compiles clean
  on Solaris.
  
  Revision  Changes    Path
  1.91      +8 -8      apache-2.0/src/modules/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -u -r1.90 -r1.91
  --- prefork.c	2000/05/24 00:42:01	1.90
  +++ prefork.c	2000/05/24 20:01:18	1.91
  @@ -1804,9 +1804,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->pid);
  +			(long)pid->pid);
   	exit(APEXIT_CHILDFATAL);
       }
       if (WIFSIGNALED(status)) {
  @@ -1822,9 +1822,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->pid, (WTERMSIG(status) >= NumSIG) ? "" : 
  +			     (long)pid->pid, (WTERMSIG(status) >= NumSIG) ? "" : 
   			     SYS_SIGLIST[WTERMSIG(status)], WTERMSIG(status),
   			     ap_coredump_dir);
   	    }
  @@ -1832,7 +1832,7 @@
   #endif
   		ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE,
   			     0, ap_server_conf,
  -			     "child pid %d exit signal %s (%d)", pid->pid,
  +			     "child pid %ld exit signal %s (%d)", (long)pid->pid,
   			     SYS_SIGLIST[WTERMSIG(status)], WTERMSIG(status));
   #ifdef WCOREDUMP
   	    }
  @@ -1840,8 +1840,8 @@
   #else
   	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE,
   			 ap_server_conf,
  -			 "child pid %d exit signal %d",
  -			 pid->pid, WTERMSIG(status));
  +			 "child pid %ld exit signal %d",
  +			 (long)pid->pid, WTERMSIG(status));
   #endif
   	}
       }
  @@ -1994,7 +1994,7 @@
   		    */
   		ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 
                               0, ap_server_conf,
  -			    "long lost child came home! (pid %d)", pid.pid);
  +			    "long lost child came home! (pid %ld)", (long)pid.pid);
   	    }
   	    /* Don't perform idle maintenance when a child dies,
   		* only do it when there's a timeout.  Remember only a
  
  
  

Mime
View raw message