Commit bdd3744f authored by Joe Orton's avatar Joe Orton
Browse files

* 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
parent 10abf5ed

include/http_config.h

+2 −2
Original line number Diff line number Diff line
@@ -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

server/config.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

server/core.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

    }

}