From: Joe Orton <jorton@apache.org>
Date: Thu, 9 Mar 2017 09:48:24 +0000 (+0000)
Subject: * server/config.c, include/http_config.h (ap_build_cont_config,
X-Git-Tag: 2.5.0-alpha~571
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f843f6fd076ae0a2d2cb1ffc56cc3fbd18de7ad9;p=apache

* server/config.c, include/http_config.h (ap_build_cont_config,
  ap_soak_end_container): Constify directive arguments - existing
  callers pass string literals.

* server/core.c (start_cond_section): Remove casts needed for above.


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

diff --git a/include/http_config.h b/include/http_config.h
index 582cb243b5..758ba7a108 100644
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -858,7 +858,7 @@ AP_DECLARE(const char *) ap_pcfg_strerror(apr_pool_t *p, ap_configfile_t *cfp,
  * @note If cmd->pool == cmd->temp_pool, ap_soak_end_container() will assume
  *       .htaccess context and use a lower maximum line length.
  */
-AP_DECLARE(const char *) ap_soak_end_container(cmd_parms *cmd, char *directive);
+AP_DECLARE(const char *) ap_soak_end_container(cmd_parms *cmd, const char *directive);
 
 /**
  * Read all data between the current &lt;foo&gt; and the matching &lt;/foo&gt; and build
@@ -878,7 +878,7 @@ AP_DECLARE(const char *) ap_build_cont_config(apr_pool_t *p,
                                               cmd_parms *parms,
                                               ap_directive_t **current,
                                               ap_directive_t **curr_parent,
-                                              char *orig_directive);
+                                              const char *orig_directive);
 
 /**
  * Build a config tree from a config file
diff --git a/server/config.c b/server/config.c
index 5af0e2d2de..475c064e1d 100644
--- a/server/config.c
+++ b/server/config.c
@@ -1242,7 +1242,7 @@ AP_DECLARE(const char *) ap_build_cont_config(apr_pool_t *p,
                                               cmd_parms *parms,
                                               ap_directive_t **current,
                                               ap_directive_t **curr_parent,
-                                              char *orig_directive)
+                                              const char *orig_directive)
 {
     char *bracket;
     const char *retval;
@@ -1615,7 +1615,7 @@ AP_DECLARE(char *) ap_runtime_dir_relative(apr_pool_t *p, const char *file)
 }
 
 
-AP_DECLARE(const char *) ap_soak_end_container(cmd_parms *cmd, char *directive)
+AP_DECLARE(const char *) ap_soak_end_container(cmd_parms *cmd, const char *directive)
 {
     struct ap_varbuf vb;
     const char *args;
diff --git a/server/core.c b/server/core.c
index 2ae5b6e3e9..113fe537ef 100644
--- a/server/core.c
+++ b/server/core.c
@@ -2802,13 +2802,13 @@ static const char *start_cond_section(cmd_parms *cmd, void *mconfig, const char
         const char *retval;
 
         retval = ap_build_cont_config(cmd->pool, cmd->temp_pool, cmd,
-                                      &current, &parent, (char *)cmd->cmd->name);
+                                      &current, &parent, cmd->cmd->name);
         *(ap_directive_t **)mconfig = current;
         return retval;
     }
     else {
         *(ap_directive_t **)mconfig = NULL;
-        return ap_soak_end_container(cmd, (char *)cmd->cmd->name);
+        return ap_soak_end_container(cmd, cmd->cmd->name);
     }
 }