diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/SAPI.c | 2 | ||||
| -rw-r--r-- | main/fopen_wrappers.c | 4 | ||||
| -rw-r--r-- | main/main.c | 8 | ||||
| -rw-r--r-- | main/output.c | 2 | ||||
| -rw-r--r-- | main/php_output.h | 4 | ||||
| -rw-r--r-- | main/php_variables.c | 20 | ||||
| -rw-r--r-- | main/streams/plain_wrapper.c | 2 |
7 files changed, 21 insertions, 21 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index 91ed4be654..2bcf19dd13 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -644,7 +644,7 @@ SAPI_API int sapi_header_op(sapi_header_op_enum op, void *arg TSRMLS_DC) int http_response_code; if (SG(headers_sent) && !SG(request_info).no_headers) { - char *output_start_filename = php_output_get_start_filename(TSRMLS_C); + const char *output_start_filename = php_output_get_start_filename(TSRMLS_C); int output_start_lineno = php_output_get_start_lineno(TSRMLS_C); if (output_start_filename) { diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index f4d122bbbb..19313561fa 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -565,7 +565,7 @@ PHPAPI char *php_resolve_path(const char *filename, int filename_length, const c /* check in calling scripts' current working directory as a fall back case */ if (zend_is_executing(TSRMLS_C)) { - char *exec_fname = zend_get_executed_filename(TSRMLS_C); + const char *exec_fname = zend_get_executed_filename(TSRMLS_C); int exec_fname_length = strlen(exec_fname); while ((--exec_fname_length >= 0) && !IS_SLASH(exec_fname[exec_fname_length])); @@ -611,7 +611,7 @@ PHPAPI char *php_resolve_path(const char *filename, int filename_length, const c PHPAPI FILE *php_fopen_with_path(const char *filename, const char *mode, const char *path, char **opened_path TSRMLS_DC) { char *pathbuf, *ptr, *end; - char *exec_fname; + const char *exec_fname; char trypath[MAXPATHLEN]; FILE *fp; int path_length; diff --git a/main/main.c b/main/main.c index 4a70b2b691..7ee8e69057 100644 --- a/main/main.c +++ b/main/main.c @@ -627,9 +627,9 @@ PHPAPI void php_verror(const char *docref, const char *params, int type, const c char *docref_target = "", *docref_root = ""; char *p; int buffer_len = 0; - char *space = ""; - char *class_name = ""; - char *function; + const char *space = ""; + const char *class_name = ""; + const char *function; int origin_len; char *origin; char *message; @@ -1287,7 +1287,7 @@ static int php_get_configuration_directive_for_zend(const char *name, uint name_ /* {{{ php_message_handler_for_zend */ -static void php_message_handler_for_zend(long message, void *data TSRMLS_DC) +static void php_message_handler_for_zend(long message, const void *data TSRMLS_DC) { switch (message) { case ZMSG_FAILED_INCLUDE_FOPEN: diff --git a/main/output.c b/main/output.c index 6006b5321d..866ff1d0f5 100644 --- a/main/output.c +++ b/main/output.c @@ -676,7 +676,7 @@ PHPAPI void php_output_set_implicit_flush(int flush TSRMLS_DC) /* {{{ char *php_output_get_start_filename(TSRMLS_D) * Get the file name where output has started */ -PHPAPI char *php_output_get_start_filename(TSRMLS_D) +PHPAPI const char *php_output_get_start_filename(TSRMLS_D) { return OG(output_start_filename); } diff --git a/main/php_output.h b/main/php_output.h index 2ba0a5b678..da212d8ff6 100644 --- a/main/php_output.h +++ b/main/php_output.h @@ -145,7 +145,7 @@ ZEND_BEGIN_MODULE_GLOBALS(output) zend_stack handlers; php_output_handler *active; php_output_handler *running; - char *output_start_filename; + const char *output_start_filename; int output_start_lineno; ZEND_END_MODULE_GLOBALS(output) @@ -201,7 +201,7 @@ PHPAPI void php_output_deactivate(TSRMLS_D); PHPAPI void php_output_set_status(int status TSRMLS_DC); PHPAPI int php_output_get_status(TSRMLS_D); PHPAPI void php_output_set_implicit_flush(int flush TSRMLS_DC); -PHPAPI char *php_output_get_start_filename(TSRMLS_D); +PHPAPI const char *php_output_get_start_filename(TSRMLS_D); PHPAPI int php_output_get_start_lineno(TSRMLS_D); PHPAPI int php_output_write_unbuffered(const char *str, size_t len TSRMLS_DC); diff --git a/main/php_variables.c b/main/php_variables.c index 40ad26fc9d..cfb2380210 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -617,9 +617,9 @@ static void php_autoglobal_merge(HashTable *dest, HashTable *src TSRMLS_DC) } /* }}} */ -static zend_bool php_auto_globals_create_server(char *name, uint name_len TSRMLS_DC); -static zend_bool php_auto_globals_create_env(char *name, uint name_len TSRMLS_DC); -static zend_bool php_auto_globals_create_request(char *name, uint name_len TSRMLS_DC); +static zend_bool php_auto_globals_create_server(const char *name, uint name_len TSRMLS_DC); +static zend_bool php_auto_globals_create_env(const char *name, uint name_len TSRMLS_DC); +static zend_bool php_auto_globals_create_request(const char *name, uint name_len TSRMLS_DC); /* {{{ php_hash_environment */ @@ -634,7 +634,7 @@ int php_hash_environment(TSRMLS_D) } /* }}} */ -static zend_bool php_auto_globals_create_get(char *name, uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_get(const char *name, uint name_len TSRMLS_DC) { zval *vars; @@ -657,7 +657,7 @@ static zend_bool php_auto_globals_create_get(char *name, uint name_len TSRMLS_DC return 0; /* don't rearm */ } -static zend_bool php_auto_globals_create_post(char *name, uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_post(const char *name, uint name_len TSRMLS_DC) { zval *vars; @@ -684,7 +684,7 @@ static zend_bool php_auto_globals_create_post(char *name, uint name_len TSRMLS_D return 0; /* don't rearm */ } -static zend_bool php_auto_globals_create_cookie(char *name, uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_cookie(const char *name, uint name_len TSRMLS_DC) { zval *vars; @@ -707,7 +707,7 @@ static zend_bool php_auto_globals_create_cookie(char *name, uint name_len TSRMLS return 0; /* don't rearm */ } -static zend_bool php_auto_globals_create_files(char *name, uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_files(const char *name, uint name_len TSRMLS_DC) { zval *vars; @@ -726,7 +726,7 @@ static zend_bool php_auto_globals_create_files(char *name, uint name_len TSRMLS_ return 0; /* don't rearm */ } -static zend_bool php_auto_globals_create_server(char *name, uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_server(const char *name, uint name_len TSRMLS_DC) { if (PG(variables_order) && (strchr(PG(variables_order),'S') || strchr(PG(variables_order),'s'))) { php_register_server_variables(TSRMLS_C); @@ -764,7 +764,7 @@ static zend_bool php_auto_globals_create_server(char *name, uint name_len TSRMLS return 0; /* don't rearm */ } -static zend_bool php_auto_globals_create_env(char *name, uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_env(const char *name, uint name_len TSRMLS_DC) { zval *env_vars = NULL; ALLOC_ZVAL(env_vars); @@ -785,7 +785,7 @@ static zend_bool php_auto_globals_create_env(char *name, uint name_len TSRMLS_DC return 0; /* don't rearm */ } -static zend_bool php_auto_globals_create_request(char *name, uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_request(const char *name, uint name_len TSRMLS_DC) { zval *form_variables; unsigned char _gpc_flags[3] = {0, 0, 0}; diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 423b4b30e4..2d9509bb66 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -1362,7 +1362,7 @@ PHPAPI php_stream *_php_stream_fopen_with_path(char *filename, char *mode, char { /* code ripped off from fopen_wrappers.c */ char *pathbuf, *ptr, *end; - char *exec_fname; + const char *exec_fname; char trypath[MAXPATHLEN]; php_stream *stream; int path_length; |