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

  for external consumption.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93969 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c
index 4098840dd21fe1d95eb0014d2007c56bda480ea2..d859a74318a4ec29e798f7edb51d45da54af4c64 100644 (file)
--- a/modules/generators/mod_status.c
+++ b/modules/generators/mod_status.c
@@ -512,7 +512,7 @@ static int status_handler(request_rec *r)
                     int indx = (i * thread_limit) + j;
 
                     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],
                                    stat_buffer[indx]);
 
@@ -581,7 +581,7 @@ static int status_handler(request_rec *r)
                     else
                         ap_rprintf(r,
                                    "<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,
                                    ps_record.pid,
                                    (int)conn_lres, my_lres, lres);
@@ -664,7 +664,7 @@ static int status_handler(request_rec *r)
                     else
                         ap_rprintf(r,
                                    "<tr><td><b>%d-%d</b></td><td>%"
-                                   APR_OS_PROC_T_FMT
+                                   APR_PID_T_FMT
                                    "</td><td>%d/%lu/%lu",
                                    i, (int)ps_record.generation,
                                    ps_record.pid, (int)conn_lres,

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 5fb2109ffd6987cb9531f62123c02c253a42d2db..f2710eb35fc65cc433d09926816b4f0f700aa0a9 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -942,7 +942,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     }
 
     /* 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_my_pid);
 

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 2e1223ca4ffe3e5e32ff25dcfafe269fdd24a83a..d199c91db42552d8e5241bd036875235dd93e731 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1394,7 +1394,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     }
     
     /* 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_my_pid);
 

diff --git a/server/mpm_common.c b/server/mpm_common.c
index dfe0f1939c68269bd6fbce0bfb1d1033218c4d9f..3433698ddbee055547d7f02070fde8d685b0a735 100644 (file)
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -262,7 +262,7 @@ int ap_process_child_status(apr_proc_t *pid, apr_exit_why_e why, int status)
         if (status == APEXIT_CHILDFATAL) {
             ap_log_error(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO,
                          0, ap_server_conf,
-                         "Child %" APR_OS_PROC_T_FMT
+                         "Child %" APR_PID_T_FMT
                          " returned a Fatal error..." APR_EOL_STR
                          "Apache is exiting!",
                          pid->pid);