httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r742685 - /httpd/httpd/trunk/modules/mappers/mod_watchdog.c
Date Mon, 09 Feb 2009 19:21:25 GMT
Author: jim
Date: Mon Feb  9 19:21:25 2009
New Revision: 742685

URL: http://svn.apache.org/viewvc?rev=742685&view=rev
Log:
use pid_t consistantly

Modified:
    httpd/httpd/trunk/modules/mappers/mod_watchdog.c

Modified: httpd/httpd/trunk/modules/mappers/mod_watchdog.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_watchdog.c?rev=742685&r1=742684&r2=742685&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_watchdog.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_watchdog.c Mon Feb  9 19:21:25 2009
@@ -84,7 +84,7 @@
 /*--------------------------------------------------------------------------*/
 /*                                                                          */
 /* Main watchdog worker thread.                                             */
-/* For singleton workers child thread theat first obtains the process       */
+/* For singleton workers child thread that first obtains the process       */
 /* mutex is running. Threads in other child's are locked on mutex.          */
 /*                                                                          */
 /*--------------------------------------------------------------------------*/
@@ -127,9 +127,9 @@
     if (w->is_running) {
         watchdog_list_t *wl = w->callbacks;
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, wd_server_conf->s,
-                     "%sWatchdog (%s) running (%d)",
+                     "%sWatchdog (%s) running (%" APR_PID_T_FMT ")",
                      w->singleton ? "Singleton" : "",
-                     w->name, getpid());
+                     w->name, (pid_t)getpid());
         apr_time_clock_hires(w->pool);
         if (wl) {
             apr_pool_t *ctx = NULL;
@@ -212,9 +212,9 @@
         }
     }
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, wd_server_conf->s,
-                     "%sWatchdog (%s) stopping (%d)",
+                     "%sWatchdog (%s) stopping (%" APR_PID_T_FMT ")",
                      w->singleton ? "Singleton" : "",
-                     w->name, getpid());
+                     w->name, (pid_t)getpid());
 
     if (locked)
         apr_proc_mutex_unlock(w->mutex);
@@ -443,7 +443,7 @@
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
                 "[%" APR_PID_T_FMT " - %s] "
                 "child second stage post config hook",
-                getpid(), ppid);
+                (pid_t)getpid(), ppid);
             return OK;
         }
     }



Mime
View raw message