httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1091079 - in /httpd/httpd/trunk/server/mpm/winnt: mpm_winnt.c mpm_winnt.h nt_eventlog.c
Date Mon, 11 Apr 2011 14:11:00 GMT
Author: trawick
Date: Mon Apr 11 14:10:59 2011
New Revision: 1091079

URL: http://svn.apache.org/viewvc?rev=1091079&view=rev
Log:
axe the cast in the call to our mpm_nt_eventlog_stderr_open()
by fixing the function

Modified:
    httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
    httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h
    httpd/httpd/trunk/server/mpm/winnt/nt_eventlog.c

Modified: httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c?rev=1091079&r1=1091078&r2=1091079&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c Mon Apr 11 14:10:59 2011
@@ -1189,7 +1189,7 @@ static void winnt_rewrite_args(process_r
          * after logging begins, and the failure can land in the log.
          */
         if (!errout) {
-            mpm_nt_eventlog_stderr_open((char*)service_name, process->pool);
+            mpm_nt_eventlog_stderr_open(service_name, process->pool);
         }
         service_to_start_success = mpm_service_to_start(&service_name,
                                                         process->pool);

Modified: httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h?rev=1091079&r1=1091078&r2=1091079&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h (original)
+++ httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h Mon Apr 11 14:10:59 2011
@@ -62,7 +62,7 @@ void mpm_start_child_console_handler(voi
 
 /* From nt_eventlog.c: */
 
-void mpm_nt_eventlog_stderr_open(char *display_name, apr_pool_t *p);
+void mpm_nt_eventlog_stderr_open(const char *display_name, apr_pool_t *p);
 void mpm_nt_eventlog_stderr_flush(void);
 
 /* From mpm_winnt.c: */

Modified: httpd/httpd/trunk/server/mpm/winnt/nt_eventlog.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/nt_eventlog.c?rev=1091079&r1=1091078&r2=1091079&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/nt_eventlog.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/nt_eventlog.c Mon Apr 11 14:10:59 2011
@@ -22,7 +22,7 @@
 #include "apr_portable.h"
 #include "ap_regkey.h"
 
-static char  *display_name  = NULL;
+static const char *display_name  = NULL;
 static HANDLE stderr_thread = NULL;
 static HANDLE stderr_ready;
 
@@ -129,7 +129,7 @@ void mpm_nt_eventlog_stderr_flush(void)
 }
 
 
-void mpm_nt_eventlog_stderr_open(char *argv0, apr_pool_t *p)
+void mpm_nt_eventlog_stderr_open(const char *argv0, apr_pool_t *p)
 {
     SECURITY_ATTRIBUTES sa;
     HANDLE hPipeRead = NULL;



Mime
View raw message