svn commit: r894361 - in /httpd/httpd/trunk/server: mpm/worker/worker.c util_mutex.c

[ta...@apache.org]

Author: takashi
Date: Tue Dec 29 11:51:40 2009
New Revision: 894361

URL: http://svn.apache.org/viewvc?rev=894361&view=rev
Log:
string constness

Modified:
    httpd/httpd/trunk/server/mpm/worker/worker.c
    httpd/httpd/trunk/server/util_mutex.c

Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=894361&r1=894360&r2=894361&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Tue Dec 29 11:51:40 2009
@@ -596,7 +596,7 @@
      */
 }
 
-static void accept_mutex_error(char *func, apr_status_t rv, int process_slot)
+static void accept_mutex_error(const char *func, apr_status_t rv, int process_slot)
 {
     int level = APLOG_EMERG;
 

Modified: httpd/httpd/trunk/server/util_mutex.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_mutex.c?rev=894361&r1=894360&r2=894361&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_mutex.c (original)
+++ httpd/httpd/trunk/server/util_mutex.c Tue Dec 29 11:51:40 2009
@@ -206,21 +206,21 @@
     /* "OmitPID" can appear at the end of the list, so build a list of
      * mutex type names while looking for "OmitPID" (anywhere) or the end
      */
-    type_list = apr_array_make(cmd->pool, 4, sizeof(char *));
+    type_list = apr_array_make(cmd->pool, 4, sizeof(const char *));
     while (*arg) {
-        char *s = ap_getword_conf(cmd->pool, &arg);
+        const char *s = ap_getword_conf(cmd->pool, &arg);
 
         if (!strcasecmp(s, "omitpid")) {
             omit_pid = 1;
         }
         else {
-            char **new_type = (char **)apr_array_push(type_list);
+            const char **new_type = (const char **)apr_array_push(type_list);
             *new_type = s;
         }
     }
 
     if (apr_is_empty_array(type_list)) { /* no mutex type?  assume "default" */
-        char **new_type = (char **)apr_array_push(type_list);
+        const char **new_type = (const char **)apr_array_push(type_list);
         *new_type = "default";
     }