string constness

Takashi Sato · Takashi Sato · commit ae0fe18819b2 · 2009-12-29T11:51:40.000Z
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
@@ -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
@@ -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";
     }
 

Original file line number	Diff line number	Diff line change
`@@ -596,7 +596,7 @@ static void dummy_signal_handler(int sig)`
`596`	`596`	`*/`
`597`	`597`	`}`
`598`	`598`
`599`		`-static void accept_mutex_error(char *func, apr_status_t rv, int process_slot)`
	`599`	`+static void accept_mutex_error(const char *func, apr_status_t rv, int process_slot)`
`600`	`600`	`{`
`601`	`601`	`int level = APLOG_EMERG;`
`602`	`602`
Original file line number	Diff line number	Diff line change
`@@ -206,21 +206,21 @@ AP_DECLARE_NONSTD(const char )ap_set_mutex(cmd_parms cmd, void *dummy,`
`206`	`206`	`/* "OmitPID" can appear at the end of the list, so build a list of`
`207`	`207`	`* mutex type names while looking for "OmitPID" (anywhere) or the end`
`208`	`208`	`*/`
`209`		`- type_list = apr_array_make(cmd->pool, 4, sizeof(char *));`
	`209`	`+ type_list = apr_array_make(cmd->pool, 4, sizeof(const char *));`
`210`	`210`	`while (*arg) {`
`211`		`- char *s = ap_getword_conf(cmd->pool, &arg);`
	`211`	`+ const char *s = ap_getword_conf(cmd->pool, &arg);`
`212`	`212`
`213`	`213`	`if (!strcasecmp(s, "omitpid")) {`
`214`	`214`	`omit_pid = 1;`
`215`	`215`	`}`
`216`	`216`	`else {`
`217`		`- char new_type = (char )apr_array_push(type_list);`
	`217`	`+ const char new_type = (const char )apr_array_push(type_list);`
`218`	`218`	`*new_type = s;`
`219`	`219`	`}`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`if (apr_is_empty_array(type_list)) { /* no mutex type? assume "default" */`
`223`		`- char new_type = (char )apr_array_push(type_list);`
	`223`	`+ const char new_type = (const char )apr_array_push(type_list);`
`224`	`224`	`*new_type = "default";`
`225`	`225`	`}`
`226`	`226`