www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Simplify s/APR_OS_PROC_T_FMT/APR_PID_T_FMT/, apr_os_foo entities aren't

Browse Source 
for external consumption.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93969 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
William A. Rowe Jr
2002-03-16 18:42:46 +00:00
parent 65a37752ec
commit d07e31f81f
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/generators/mod_status.c
View File

@@ -512,7 +512,7 @@ static int status_handler(request_rec *r)
int indx = (i * thread_limit) + j; int indx = (i * thread_limit) + j;
if (stat_buffer[indx] != '.') { if (stat_buffer[indx] != '.') {
ap_rprintf(r, " %" APR_OS_PROC_T_FMT ap_rprintf(r, " %" APR_PID_T_FMT
" in state: %c ", pid_buffer[i], " in state: %c ", pid_buffer[i],
stat_buffer[indx]); stat_buffer[indx]);
@@ -581,7 +581,7 @@ static int status_handler(request_rec *r)
else else
ap_rprintf(r, ap_rprintf(r,
"<b>Server %d-%d</b> (%" "<b>Server %d-%d</b> (%"
APR_OS_PROC_T_FMT "): %d|%lu|%lu [", APR_PID_T_FMT "): %d|%lu|%lu [",
i, (int) ps_record.generation, i, (int) ps_record.generation,
ps_record.pid, ps_record.pid,
(int)conn_lres, my_lres, lres); (int)conn_lres, my_lres, lres);
@@ -664,7 +664,7 @@ static int status_handler(request_rec *r)
else else
ap_rprintf(r, ap_rprintf(r,
"<tr><td><b>%d-%d</b></td><td>%" "<tr><td><b>%d-%d</b></td><td>%"
APR_OS_PROC_T_FMT APR_PID_T_FMT
"</td><td>%d/%lu/%lu", "</td><td>%d/%lu/%lu",
i, (int)ps_record.generation, i, (int)ps_record.generation,
ps_record.pid, (int)conn_lres, ps_record.pid, (int)conn_lres,

2
server/mpm/prefork/prefork.c
View File

@@ -942,7 +942,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
} }
/* Initialize cross-process accept lock */ /* Initialize cross-process accept lock */
ap_lock_fname = apr_psprintf(_pconf, "%s.%" APR_OS_PROC_T_FMT, ap_lock_fname = apr_psprintf(_pconf, "%s.%" APR_PID_T_FMT,
ap_server_root_relative(_pconf, ap_lock_fname), ap_server_root_relative(_pconf, ap_lock_fname),
ap_my_pid); ap_my_pid);

2
server/mpm/worker/worker.c
View File

@@ -1394,7 +1394,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
} }
/* Initialize cross-process accept lock */ /* Initialize cross-process accept lock */
ap_lock_fname = apr_psprintf(_pconf, "%s.%" APR_OS_PROC_T_FMT, ap_lock_fname = apr_psprintf(_pconf, "%s.%" APR_PID_T_FMT,
ap_server_root_relative(_pconf, ap_lock_fname), ap_server_root_relative(_pconf, ap_lock_fname),
ap_my_pid); ap_my_pid);

2
server/mpm_common.c
View File

@@ -262,7 +262,7 @@ int ap_process_child_status(apr_proc_t *pid, apr_exit_why_e why, int status)
if (status == APEXIT_CHILDFATAL) { if (status == APEXIT_CHILDFATAL) {
ap_log_error(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, ap_log_error(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO,
0, ap_server_conf, 0, ap_server_conf,
"Child %" APR_OS_PROC_T_FMT "Child %" APR_PID_T_FMT
" returned a Fatal error..." APR_EOL_STR " returned a Fatal error..." APR_EOL_STR
"Apache is exiting!", "Apache is exiting!",
pid->pid); pid->pid);