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/dexter dexter.c
Date Tue, 23 May 2000 13:56:39 GMT
trawick     00/05/23 06:56:39

  Modified:    src/modules/mpm/dexter dexter.c
  Log:
  Clean up some pid_t vs. int confusion in dexter.c.  This is
  needed to avoid some warnings on Solaris.
  
  Revision  Changes    Path
  1.83      +11 -10    apache-2.0/src/modules/mpm/dexter/dexter.c
  
  Index: dexter.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/dexter.c,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- dexter.c	2000/05/22 17:05:19	1.82
  +++ dexter.c	2000/05/23 13:56:39	1.83
  @@ -372,7 +372,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.
  @@ -380,9 +380,9 @@
       if ((WIFEXITED(status)) &&
   	WEXITSTATUS(status) == APEXIT_CHILDFATAL) {
   	ap_log_error(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, errno, 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)) {
  @@ -398,9 +398,9 @@
   	    if (WCOREDUMP(status)) {
   		ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, errno,
   			     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);
   	    }
  @@ -408,7 +408,7 @@
   #endif
   		ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, errno,
   			     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
   	    }
  @@ -416,8 +416,8 @@
   #else
   	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, errno,
   			 ap_server_conf,
  -			 "child pid %d exit signal %d",
  -			 pid, WTERMSIG(status));
  +			 "child pid %ld exit signal %d",
  +			 (long)pid, WTERMSIG(status));
   #endif
   	}
       }
  @@ -982,7 +982,7 @@
           pid = ap_wait_or_timeout(&status, pconf);
           
           if (pid != NULL) {
  -            int actual_pid;
  +            pid_t actual_pid;
               ap_get_os_proc(&actual_pid, pid);
               process_child_status(pid, status);
               /* non-fatal death... note that it's gone in the child table and
  @@ -1023,7 +1023,8 @@
   		 */
   		ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, errno, 
                                ap_server_conf,
  -			    "long lost child came home! (pid %d)", actual_pid);
  +			    "long lost child came home! (pid %ld)", 
  +                             (long)actual_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