You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2017/07/18 15:06:15 UTC
svn commit: r1802309 - in /httpd/httpd/trunk/server: config.c main.c
Author: ylavic
Date: Tue Jul 18 15:06:15 2017
New Revision: 1802309
URL: http://svn.apache.org/viewvc?rev=1802309&view=rev
Log:
ap_server_config_defines and ap_server_{pre,post}_read_config are arrays of
*const* strings (must not change after being inserted), make it explicit.
Modified:
httpd/httpd/trunk/server/config.c
httpd/httpd/trunk/server/main.c
Modified: httpd/httpd/trunk/server/config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/config.c?rev=1802309&r1=1802308&r2=1802309&view=diff
==============================================================================
--- httpd/httpd/trunk/server/config.c (original)
+++ httpd/httpd/trunk/server/config.c Tue Jul 18 15:06:15 2017
@@ -1722,14 +1722,14 @@ typedef struct {
static apr_status_t arr_elts_getstr(void *buf, apr_size_t bufsiz, void *param)
{
arr_elts_param_t *arr_param = (arr_elts_param_t *)param;
- char *elt;
+ const char *elt;
/* End of array reached? */
if (++arr_param->curr_idx > arr_param->array->nelts)
return APR_EOF;
/* return the line */
- elt = ((char **)arr_param->array->elts)[arr_param->curr_idx - 1];
+ elt = ((const char **)arr_param->array->elts)[arr_param->curr_idx - 1];
if (apr_cpystrn(buf, elt, bufsiz) - (char *)buf >= bufsiz - 1)
return APR_ENOSPC;
return APR_SUCCESS;
Modified: httpd/httpd/trunk/server/main.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/main.c?rev=1802309&r1=1802308&r2=1802309&view=diff
==============================================================================
--- httpd/httpd/trunk/server/main.c (original)
+++ httpd/httpd/trunk/server/main.c Tue Jul 18 15:06:15 2017
@@ -499,9 +499,12 @@ int main(int argc, const char * const ar
apr_pool_create(&pcommands, ap_pglobal);
apr_pool_tag(pcommands, "pcommands");
- ap_server_pre_read_config = apr_array_make(pcommands, 1, sizeof(char *));
- ap_server_post_read_config = apr_array_make(pcommands, 1, sizeof(char *));
- ap_server_config_defines = apr_array_make(pcommands, 1, sizeof(char *));
+ ap_server_pre_read_config = apr_array_make(pcommands, 1,
+ sizeof(const char *));
+ ap_server_post_read_config = apr_array_make(pcommands, 1,
+ sizeof(const char *));
+ ap_server_config_defines = apr_array_make(pcommands, 1,
+ sizeof(const char *));
error = ap_setup_prelinked_modules(process);
if (error) {
@@ -519,16 +522,16 @@ int main(int argc, const char * const ar
while ((rv = apr_getopt(opt, AP_SERVER_BASEARGS, &c, &opt_arg))
== APR_SUCCESS) {
- char **new;
+ const char **new;
switch (c) {
case 'c':
- new = (char **)apr_array_push(ap_server_post_read_config);
+ new = (const char **)apr_array_push(ap_server_post_read_config);
*new = apr_pstrdup(pcommands, opt_arg);
break;
case 'C':
- new = (char **)apr_array_push(ap_server_pre_read_config);
+ new = (const char **)apr_array_push(ap_server_pre_read_config);
*new = apr_pstrdup(pcommands, opt_arg);
break;
@@ -537,7 +540,7 @@ int main(int argc, const char * const ar
break;
case 'D':
- new = (char **)apr_array_push(ap_server_config_defines);
+ new = (const char **)apr_array_push(ap_server_config_defines);
*new = apr_pstrdup(pcommands, opt_arg);
/* Setting -D DUMP_VHOSTS should work like setting -S */
if (strcmp(opt_arg, "DUMP_VHOSTS") == 0)
@@ -563,7 +566,7 @@ int main(int argc, const char * const ar
break;
case 'X':
- new = (char **)apr_array_push(ap_server_config_defines);
+ new = (const char **)apr_array_push(ap_server_config_defines);
*new = "DEBUG";
break;
@@ -596,15 +599,15 @@ int main(int argc, const char * const ar
case 'S':
ap_run_mode = AP_SQ_RM_CONFIG_DUMP;
- new = (char **)apr_array_push(ap_server_config_defines);
+ new = (const char **)apr_array_push(ap_server_config_defines);
*new = "DUMP_VHOSTS";
- new = (char **)apr_array_push(ap_server_config_defines);
+ new = (const char **)apr_array_push(ap_server_config_defines);
*new = "DUMP_RUN_CFG";
break;
case 'M':
ap_run_mode = AP_SQ_RM_CONFIG_DUMP;
- new = (char **)apr_array_push(ap_server_config_defines);
+ new = (const char **)apr_array_push(ap_server_config_defines);
*new = "DUMP_MODULES";
break;