string constness

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

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 296a75fbcdfa8db7eee1ff7e03fad7368e222778..446572cfbff4cd7dd7f5e5119f44e51e6a4020dc 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -596,7 +596,7 @@ static void dummy_signal_handler(int sig)
      */
 }
 
-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;
 

diff --git a/server/util_mutex.c b/server/util_mutex.c
index 7094ae28475079dc99216d855c9ab5a3a9687a72..0f654882fdbcb432088be3ecd5607f2b2366f762 100644 (file)
--- a/server/util_mutex.c
+++ b/server/util_mutex.c
@@ -206,21 +206,21 @@ AP_DECLARE_NONSTD(const char *)ap_set_mutex(cmd_parms *cmd, void *dummy,
     /* "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";
     }