www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Code Activity

* server/config.c, include/http_config.h (ap_build_cont_config,

Browse Source 
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
This commit is contained in:
Joe Orton
2017-03-09 09:48:24 +00:00
parent d20f527062
commit f843f6fd07
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/http_config.h
View File

@@ -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 <foo> and the matching </foo> 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

4
server/config.c
View File

@@ -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;

4
server/core.c
View File

@@ -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);
}
}