1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-05 16:55:50 +03:00

change various strings from char * to const char *

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1351017 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
2012-06-16 22:45:33 +00:00
parent cb0cf2cf81
commit cbb93c651b
3 changed files with 9 additions and 7 deletions

View File

@@ -54,7 +54,7 @@ typedef struct
apr_array_header_t *package_cpaths; apr_array_header_t *package_cpaths;
/* name of base file to load in the vm */ /* name of base file to load in the vm */
char *file; const char *file;
/* APL_SCOPE_ONCE | APL_SCOPE_REQUEST | APL_SCOPE_CONN | APL_SCOPE_THREAD */ /* APL_SCOPE_ONCE | APL_SCOPE_REQUEST | APL_SCOPE_CONN | APL_SCOPE_THREAD */
int scope; int scope;
@@ -75,8 +75,8 @@ typedef struct
typedef struct typedef struct
{ {
char *function_name; const char *function_name;
char *file_name; const char *file_name;
int scope; int scope;
ap_regex_t *uri_pattern; ap_regex_t *uri_pattern;
const char *bytecode; const char *bytecode;

View File

@@ -184,6 +184,7 @@ static int lua_request_rec_hook_harness(request_rec *r, const char *name, int ap
if (hook_specs) { if (hook_specs) {
int i; int i;
for (i = 0; i < hook_specs->nelts; i++) { for (i = 0; i < hook_specs->nelts; i++) {
char *file;
ap_lua_mapped_handler_spec *hook_spec = ap_lua_mapped_handler_spec *hook_spec =
((ap_lua_mapped_handler_spec **) hook_specs->elts)[i]; ((ap_lua_mapped_handler_spec **) hook_specs->elts)[i];
@@ -202,8 +203,9 @@ static int lua_request_rec_hook_harness(request_rec *r, const char *name, int ap
spec->cb = &lua_open_callback; spec->cb = &lua_open_callback;
spec->cb_arg = NULL; spec->cb_arg = NULL;
apr_filepath_merge(&spec->file, server_cfg->root_path, apr_filepath_merge(&file, server_cfg->root_path,
spec->file, APR_FILEPATH_NOTRELATIVE, r->pool); spec->file, APR_FILEPATH_NOTRELATIVE, r->pool);
spec->file = file;
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01476) ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01476)
"request details scope:%u, filename:%s, function:%s", "request details scope:%u, filename:%s, function:%s",

View File

@@ -113,7 +113,7 @@ typedef struct
apr_hash_t *hooks; /* <wombat_hook_info> */ apr_hash_t *hooks; /* <wombat_hook_info> */
/* the actual directory being configured */ /* the actual directory being configured */
char *dir; const char *dir;
/* Whether Lua scripts in a sub-dir are run before parents */ /* Whether Lua scripts in a sub-dir are run before parents */
ap_lua_inherit_t inherit; ap_lua_inherit_t inherit;
@@ -131,7 +131,7 @@ typedef struct
typedef struct typedef struct
{ {
char *function_name; const char *function_name;
ap_lua_vm_spec *spec; ap_lua_vm_spec *spec;
} mapped_request_details; } mapped_request_details;
@@ -144,7 +144,7 @@ typedef struct
typedef struct typedef struct
{ {
lua_State *L; lua_State *L;
char *function; const char *function;
} ap_lua_filter_ctx; } ap_lua_filter_ctx;
extern module AP_MODULE_DECLARE_DATA lua_module; extern module AP_MODULE_DECLARE_DATA lua_module;