From 2985b4f9e38739d8c2faa6ff993034c0308f142c Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Fri, 15 Aug 2008 19:45:25 +0000 Subject: [PATCH] - Removed some TSRMLS_FETCH()s --- Zend/zend.c | 14 ++++++-------- Zend/zend.h | 10 +++++----- Zend/zend_alloc.c | 20 +++++++++++--------- Zend/zend_alloc.h | 2 +- Zend/zend_execute.c | 6 ++---- Zend/zend_gc.c | 3 +-- Zend/zend_gc.h | 4 ++-- Zend/zend_language_scanner.c | 8 ++++---- Zend/zend_language_scanner.l | 6 +++--- Zend/zend_operators.c | 14 +++++++------- Zend/zend_stream.c | 2 +- Zend/zend_vm_def.h | 4 ++-- Zend/zend_vm_execute.h | 16 ++++++++-------- main/main.c | 10 +++------- 14 files changed, 56 insertions(+), 63 deletions(-) diff --git a/Zend/zend.c b/Zend/zend.c index 3d1b6f4881..d2b9145bca 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -58,7 +58,7 @@ ZEND_API int (*zend_printf)(const char *format, ...); ZEND_API zend_write_func_t zend_write; ZEND_API int (*zend_path_encode)(char **encpath, int *encpath_len, const UChar *path, int path_len TSRMLS_DC); ZEND_API int (*zend_path_decode)(UChar **decpath, int *decpath_len, const char *path, int path_len TSRMLS_DC); -ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path); +ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path TSRMLS_DC); ZEND_API int (*zend_stream_open_function)(const char *filename, zend_file_handle *handle TSRMLS_DC); ZEND_API void (*zend_block_interruptions)(void); ZEND_API void (*zend_unblock_interruptions)(void); @@ -70,7 +70,7 @@ ZEND_API char *(*zend_resolve_path)(const char *filename, int filename_len TSRML void (*zend_on_timeout)(int seconds TSRMLS_DC); -static void (*zend_message_dispatcher_p)(long message, void *data); +static void (*zend_message_dispatcher_p)(long message, void *data TSRMLS_DC); static int (*zend_get_configuration_directive_p)(const char *name, uint name_length, zval *contents); static ZEND_INI_MH(OnUpdateErrorReporting) /* {{{ */ @@ -665,7 +665,7 @@ static int zend_path_decode_wrapper(UChar **decpath, int *decpath_len, const cha } /* }}} */ -static FILE *zend_fopen_wrapper(const char *filename, char **opened_path) /* {{{ */ +static FILE *zend_fopen_wrapper(const char *filename, char **opened_path TSRMLS_DC) /* {{{ */ { if (opened_path) { *opened_path = estrdup(filename); @@ -1045,7 +1045,7 @@ static void unicode_globals_dtor(zend_unicode_globals *unicode_globals TSRMLS_DC void zend_init_opcodes_handlers(void); -int zend_startup(zend_utility_functions *utility_functions, char **extensions) /* {{{ */ +int zend_startup(zend_utility_functions *utility_functions, char **extensions TSRMLS_DC) /* {{{ */ { #ifdef ZTS zend_compiler_globals *compiler_globals; @@ -1058,7 +1058,6 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) / extern zend_php_scanner_globals language_scanner_globals; extern zend_unicode_globals unicode_globals; #endif - TSRMLS_FETCH(); #ifndef __GNUC__ null_zstr.v = NULL; @@ -1140,7 +1139,6 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) / ts_allocate_id(&ini_scanner_globals_id, sizeof(zend_ini_scanner_globals), (ts_allocate_ctor) ini_scanner_globals_ctor, NULL); compiler_globals = ts_resource(compiler_globals_id); executor_globals = ts_resource(executor_globals_id); - tsrm_ls = ts_resource_ex(0, NULL); compiler_globals_dtor(compiler_globals TSRMLS_CC); compiler_globals->in_compilation = 0; @@ -1468,10 +1466,10 @@ void zend_post_deactivate_modules(TSRMLS_D) /* {{{ */ /* }}} */ BEGIN_EXTERN_C() -ZEND_API void zend_message_dispatcher(long message, void *data) /* {{{ */ +ZEND_API void zend_message_dispatcher(long message, void *data TSRMLS_DC) /* {{{ */ { if (zend_message_dispatcher_p) { - zend_message_dispatcher_p(message, data); + zend_message_dispatcher_p(message, data TSRMLS_CC); } } /* }}} */ diff --git a/Zend/zend.h b/Zend/zend.h index aba29156ec..fd2b887f3a 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -509,8 +509,8 @@ typedef struct _zend_utility_functions { int (*write_function)(const char *str, uint str_length); int (*path_encode_function)(char **encpath, int *encpath_len, const UChar *path, int path_len TSRMLS_DC); int (*path_decode_function)(UChar **decpath, int *decpath_len, const char *path, int path_len TSRMLS_DC); - FILE *(*fopen_function)(const char *filename, char **opened_path); - void (*message_handler)(long message, void *data); + FILE *(*fopen_function)(const char *filename, char **opened_path TSRMLS_DC); + void (*message_handler)(long message, void *data TSRMLS_DC); void (*block_interruptions)(void); void (*unblock_interruptions)(void); int (*get_configuration_directive)(const char *name, uint name_length, zval *contents); @@ -572,7 +572,7 @@ typedef int (*zend_write_func_t)(const char *str, uint str_length); /* default engine string type */ #define ZEND_STR_TYPE (UG(unicode) ? IS_UNICODE : IS_STRING) -int zend_startup(zend_utility_functions *utility_functions, char **extensions); +int zend_startup(zend_utility_functions *utility_functions, char **extensions TSRMLS_DC); void zend_shutdown(TSRMLS_D); void zend_register_standard_ini_entries(TSRMLS_D); void zend_post_startup(TSRMLS_D); @@ -660,7 +660,7 @@ extern ZEND_API int (*zend_printf)(const char *format, ...); extern ZEND_API zend_write_func_t zend_write; extern ZEND_API int (*zend_path_encode)(char **encpath, int *encpath_len, const UChar *path, int path_len TSRMLS_DC); extern ZEND_API int (*zend_path_decode)(UChar **decpath, int *decpath_len, const char *path, int path_len TSRMLS_DC); -extern ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path); +extern ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path TSRMLS_DC); extern ZEND_API void (*zend_block_interruptions)(void); extern ZEND_API void (*zend_unblock_interruptions)(void); extern ZEND_API void (*zend_ticks_function)(int ticks); @@ -689,7 +689,7 @@ END_EXTERN_C() #define HANDLE_UNBLOCK_INTERRUPTIONS() if (zend_unblock_interruptions) { zend_unblock_interruptions(); } BEGIN_EXTERN_C() -ZEND_API void zend_message_dispatcher(long message, void *data); +ZEND_API void zend_message_dispatcher(long message, void *data TSRMLS_DC); ZEND_API int zend_get_configuration_directive(const char *name, uint name_length, zval *contents); ZEND_API void zend_reset_locale_deps(TSRMLS_D); diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index a1a3e1a246..8477751c8e 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -1216,7 +1216,7 @@ static long zend_mm_find_leaks(zend_mm_segment *segment, zend_mm_block *b) /* {{ } /* }}} */ -static void zend_mm_check_leaks(zend_mm_heap *heap) /* {{{ */ +static void zend_mm_check_leaks(zend_mm_heap *heap TSRMLS_DC) /* {{{ */ { zend_mm_segment *segment = heap->segments_list; zend_mm_block *p, *q; @@ -1247,12 +1247,12 @@ static void zend_mm_check_leaks(zend_mm_heap *heap) /* {{{ */ leak.orig_filename = p->debug.orig_filename; leak.orig_lineno = p->debug.orig_lineno; - zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL); - zend_message_dispatcher(ZMSG_MEMORY_LEAK_DETECTED, &leak); + zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL TSRMLS_CC); + zend_message_dispatcher(ZMSG_MEMORY_LEAK_DETECTED, &leak TSRMLS_CC); repeated = zend_mm_find_leaks(segment, p); total += 1 + repeated; if (repeated) { - zend_message_dispatcher(ZMSG_MEMORY_LEAK_REPEATED, (void *)(zend_uintptr_t)repeated); + zend_message_dispatcher(ZMSG_MEMORY_LEAK_REPEATED, (void *)(zend_uintptr_t)repeated TSRMLS_CC); } #if ZEND_MM_CACHE } else if (p->magic == MEM_BLOCK_CACHED) { @@ -1272,7 +1272,7 @@ static void zend_mm_check_leaks(zend_mm_heap *heap) /* {{{ */ p = q; } if (total) { - zend_message_dispatcher(ZMSG_MEMORY_LEAKS_GRAND_TOTAL, &total); + zend_message_dispatcher(ZMSG_MEMORY_LEAKS_GRAND_TOTAL, &total TSRMLS_CC); } } /* }}} */ @@ -1292,7 +1292,9 @@ static int zend_mm_check_ptr(zend_mm_heap *heap, void *ptr, int silent ZEND_FILE no_cache_notice = 1; } if (!silent) { - zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL); + TSRMLS_FETCH(); + + zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL TSRMLS_CC); zend_debug_alloc_output("---------------------------------------\n"); zend_debug_alloc_output("%s(%d) : Block "PTR_FMT" status:\n" ZEND_FILE_LINE_RELAY_CC, ptr); if (__zend_orig_filename) { @@ -1543,7 +1545,7 @@ static int zend_mm_check_heap(zend_mm_heap *heap, int silent ZEND_FILE_LINE_DC Z /* }}} */ #endif -ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent) /* {{{ */ +ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC) /* {{{ */ { zend_mm_storage *storage; zend_mm_segment *segment; @@ -1607,7 +1609,7 @@ ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent #if ZEND_DEBUG if (!silent) { - zend_mm_check_leaks(heap); + zend_mm_check_leaks(heap TSRMLS_CC); } #endif @@ -2628,7 +2630,7 @@ ZEND_API size_t zend_memory_peak_usage(int real_usage TSRMLS_DC) /* {{{ */ ZEND_API void shutdown_memory_manager(int silent, int full_shutdown TSRMLS_DC) /* {{{ */ { - zend_mm_shutdown(AG(mm_heap), full_shutdown, silent); + zend_mm_shutdown(AG(mm_heap), full_shutdown, silent TSRMLS_CC); } /* }}} */ diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h index 4cd6314279..3e5a528778 100644 --- a/Zend/zend_alloc.h +++ b/Zend/zend_alloc.h @@ -183,7 +183,7 @@ END_EXTERN_C() typedef struct _zend_mm_heap zend_mm_heap; ZEND_API zend_mm_heap *zend_mm_startup(void); -ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent); +ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC); ZEND_API void *_zend_mm_alloc(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC; ZEND_API void _zend_mm_free(zend_mm_heap *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); ZEND_API void *_zend_mm_realloc(zend_mm_heap *heap, void *p, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index b7b49eeaa1..5e515aa532 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -83,11 +83,9 @@ static inline void zend_pzval_unlock_func(zval *z, zend_free_op *should_free, in } /* }}} */ -static inline void zend_pzval_unlock_free_func(zval *z) /* {{{ */ +static inline void zend_pzval_unlock_free_func(zval *z TSRMLS_DC) /* {{{ */ { if (!Z_DELREF_P(z)) { - TSRMLS_FETCH(); - if (z != &EG(uninitialized_zval)) { GC_REMOVE_ZVAL_FROM_BUFFER(z); zval_dtor(z); @@ -99,7 +97,7 @@ static inline void zend_pzval_unlock_free_func(zval *z) /* {{{ */ #define PZVAL_UNLOCK(z, f) zend_pzval_unlock_func(z, f, 1 TSRMLS_CC) #define PZVAL_UNLOCK_EX(z, f, u) zend_pzval_unlock_func(z, f, u TSRMLS_CC) -#define PZVAL_UNLOCK_FREE(z) zend_pzval_unlock_free_func(z) +#define PZVAL_UNLOCK_FREE(z) zend_pzval_unlock_free_func(z TSRMLS_CC) #define PZVAL_LOCK(z) Z_ADDREF_P((z)) #define RETURN_VALUE_UNUSED(pzn) (((pzn)->u.EA.type & EXT_TYPE_UNUSED)) #define SELECTIVE_PZVAL_LOCK(pzv, pzn) if (!RETURN_VALUE_UNUSED(pzn)) { PZVAL_LOCK(pzv); } diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c index 59ec410ef4..76a490b8ed 100644 --- a/Zend/zend_gc.c +++ b/Zend/zend_gc.c @@ -252,10 +252,9 @@ ZEND_API void gc_zobj_possible_root(zval *zv TSRMLS_DC) } } -ZEND_API void gc_remove_zval_from_buffer(zval *zv) +ZEND_API void gc_remove_zval_from_buffer(zval *zv TSRMLS_DC) { gc_root_buffer* root_buffer = GC_ADDRESS(((zval_gc_info*)zv)->u.buffered); - TSRMLS_FETCH(); if (UNEXPECTED(GC_G(free_list) != NULL && GC_ZVAL_GET_COLOR(zv) == GC_BLACK) && diff --git a/Zend/zend_gc.h b/Zend/zend_gc.h index d72ef72ab7..3baf45c538 100644 --- a/Zend/zend_gc.h +++ b/Zend/zend_gc.h @@ -142,7 +142,7 @@ BEGIN_EXTERN_C() ZEND_API int gc_collect_cycles(TSRMLS_D); ZEND_API void gc_zval_possible_root(zval *zv TSRMLS_DC); ZEND_API void gc_zobj_possible_root(zval *zv TSRMLS_DC); -ZEND_API void gc_remove_zval_from_buffer(zval *zv); +ZEND_API void gc_remove_zval_from_buffer(zval *zv TSRMLS_DC); ZEND_API void gc_globals_ctor(TSRMLS_D); ZEND_API void gc_globals_dtor(TSRMLS_D); ZEND_API void gc_init(TSRMLS_D); @@ -157,7 +157,7 @@ END_EXTERN_C() #define GC_REMOVE_ZVAL_FROM_BUFFER(z) \ if (GC_ADDRESS(((zval_gc_info*)z)->u.buffered)) { \ - gc_remove_zval_from_buffer(z); \ + gc_remove_zval_from_buffer(z TSRMLS_CC); \ } #define GC_ZOBJ_CHECK_POSSIBLE_ROOT(zobject) \ diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c index 2672309a9a..c8048137e9 100644 --- a/Zend/zend_language_scanner.c +++ b/Zend/zend_language_scanner.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Wed Aug 13 11:32:11 2008 */ +/* Generated by re2c 0.13.5 on Fri Aug 15 14:35:03 2008 */ #line 1 "Zend/zend_language_scanner.l" /* +----------------------------------------------------------------------+ @@ -752,10 +752,10 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR if (open_file_for_scanning(file_handle TSRMLS_CC)==FAILURE) { if (type==ZEND_REQUIRE) { - zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename); + zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename TSRMLS_CC); zend_bailout(); } else { - zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename); + zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename TSRMLS_CC); } compilation_successful=0; } else { @@ -935,7 +935,7 @@ int highlight_file(char *filename, zend_syntax_highlighter_ini *syntax_highlight file_handle.opened_path = NULL; zend_save_lexical_state(&original_lex_state TSRMLS_CC); if (open_file_for_scanning(&file_handle TSRMLS_CC)==FAILURE) { - zend_message_dispatcher(ZMSG_FAILED_HIGHLIGHT_FOPEN, filename); + zend_message_dispatcher(ZMSG_FAILED_HIGHLIGHT_FOPEN, filename TSRMLS_CC); return FAILURE; } zend_highlight(syntax_highlighter_ini TSRMLS_CC); diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 5bec659837..694a3a145c 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -750,10 +750,10 @@ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSR if (open_file_for_scanning(file_handle TSRMLS_CC)==FAILURE) { if (type==ZEND_REQUIRE) { - zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename); + zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename TSRMLS_CC); zend_bailout(); } else { - zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename); + zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename TSRMLS_CC); } compilation_successful=0; } else { @@ -933,7 +933,7 @@ int highlight_file(char *filename, zend_syntax_highlighter_ini *syntax_highlight file_handle.opened_path = NULL; zend_save_lexical_state(&original_lex_state TSRMLS_CC); if (open_file_for_scanning(&file_handle TSRMLS_CC)==FAILURE) { - zend_message_dispatcher(ZMSG_FAILED_HIGHLIGHT_FOPEN, filename); + zend_message_dispatcher(ZMSG_FAILED_HIGHLIGHT_FOPEN, filename TSRMLS_CC); return FAILURE; } zend_highlight(syntax_highlighter_ini TSRMLS_CC); diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 59ec5cc289..bd0c84671a 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1949,7 +1949,7 @@ ZEND_API int numeric_compare_function(zval *result, zval *op1, zval *op2 TSRMLS_ } /* }}} */ -static inline void zend_free_obj_get_result(zval *op) /* {{{ */ +static inline void zend_free_obj_get_result(zval *op TSRMLS_DC) /* {{{ */ { if (Z_REFCOUNT_P(op) == 0) { GC_REMOVE_ZVAL_FROM_BUFFER(op); @@ -2075,18 +2075,18 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* { if (Z_OBJ_HT_P(op1)->get) { op_free = Z_OBJ_HT_P(op1)->get(op1 TSRMLS_CC); ret = compare_function(result, op_free, op2 TSRMLS_CC); - zend_free_obj_get_result(op_free); + zend_free_obj_get_result(op_free TSRMLS_CC); return ret; } else if (Z_TYPE_P(op2) != IS_OBJECT && Z_OBJ_HT_P(op1)->cast_object) { ALLOC_INIT_ZVAL(op_free); if (Z_OBJ_HT_P(op1)->cast_object(op1, op_free, Z_TYPE_P(op2), NULL TSRMLS_CC) == FAILURE) { ZVAL_LONG(result, 1); - zend_free_obj_get_result(op_free); + zend_free_obj_get_result(op_free TSRMLS_CC); return SUCCESS; } ret = compare_function(result, op_free, op2 TSRMLS_CC); - zend_free_obj_get_result(op_free); + zend_free_obj_get_result(op_free TSRMLS_CC); return ret; } } @@ -2094,18 +2094,18 @@ ZEND_API int compare_function(zval *result, zval *op1, zval *op2 TSRMLS_DC) /* { if (Z_OBJ_HT_P(op2)->get) { op_free = Z_OBJ_HT_P(op2)->get(op2 TSRMLS_CC); ret = compare_function(result, op1, op_free TSRMLS_CC); - zend_free_obj_get_result(op_free); + zend_free_obj_get_result(op_free TSRMLS_CC); return ret; } else if (Z_TYPE_P(op1) != IS_OBJECT && Z_OBJ_HT_P(op2)->cast_object) { ALLOC_INIT_ZVAL(op_free); if (Z_OBJ_HT_P(op2)->cast_object(op2, op_free, Z_TYPE_P(op1), NULL TSRMLS_CC) == FAILURE) { ZVAL_LONG(result, -1); - zend_free_obj_get_result(op_free); + zend_free_obj_get_result(op_free TSRMLS_CC); return SUCCESS; } ret = compare_function(result, op1, op_free TSRMLS_CC); - zend_free_obj_get_result(op_free); + zend_free_obj_get_result(op_free TSRMLS_CC); return ret; } } diff --git a/Zend/zend_stream.c b/Zend/zend_stream.c index 11807fd00f..a514751b31 100644 --- a/Zend/zend_stream.c +++ b/Zend/zend_stream.c @@ -109,7 +109,7 @@ ZEND_API int zend_stream_open(const char *filename, zend_file_handle *handle TSR } handle->type = ZEND_HANDLE_FP; handle->opened_path = NULL; - handle->handle.fp = zend_fopen(filename, &handle->opened_path); + handle->handle.fp = zend_fopen(filename, &handle->opened_path TSRMLS_CC); handle->filename = (char *)filename; handle->free_filename = 0; memset(&handle->handle.stream.mmap, 0, sizeof(zend_mmap)); diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 0b975dd19c..e795d17608 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -3345,9 +3345,9 @@ ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMP|VAR|CV, ANY) } } else { if (Z_LVAL(opline->op2.u.constant)==ZEND_INCLUDE_ONCE) { - zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } else { - zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } } if (resolved_path != Z_STRVAL_P(inc_filename)) { diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index a5dd6417d2..4f2fac5e90 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -1908,9 +1908,9 @@ static int ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HA } } else { if (Z_LVAL(opline->op2.u.constant)==ZEND_INCLUDE_ONCE) { - zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } else { - zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } } if (resolved_path != Z_STRVAL_P(inc_filename)) { @@ -5335,9 +5335,9 @@ static int ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_TMP_HANDLER(ZEND_OPCODE_HAND } } else { if (Z_LVAL(opline->op2.u.constant)==ZEND_INCLUDE_ONCE) { - zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } else { - zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } } if (resolved_path != Z_STRVAL_P(inc_filename)) { @@ -8779,9 +8779,9 @@ static int ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_VAR_HANDLER(ZEND_OPCODE_HAND } } else { if (Z_LVAL(opline->op2.u.constant)==ZEND_INCLUDE_ONCE) { - zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } else { - zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } } if (resolved_path != Z_STRVAL_P(inc_filename)) { @@ -23468,9 +23468,9 @@ static int ZEND_FASTCALL ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDL } } else { if (Z_LVAL(opline->op2.u.constant)==ZEND_INCLUDE_ONCE) { - zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } else { - zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } } if (resolved_path != Z_STRVAL_P(inc_filename)) { diff --git a/main/main.c b/main/main.c index 9674a240a8..d8f878b0b8 100644 --- a/main/main.c +++ b/main/main.c @@ -1142,10 +1142,8 @@ static int php_path_decode_for_zend(UChar **decpath, int *decpath_len, const cha /* {{{ php_fopen_wrapper_for_zend */ -static FILE *php_fopen_wrapper_for_zend(const char *filename, char **opened_path) +static FILE *php_fopen_wrapper_for_zend(const char *filename, char **opened_path TSRMLS_DC) { - TSRMLS_FETCH(); - return php_stream_open_wrapper_as_file((char *)filename, "rb", USE_PATH|IGNORE_URL_WIN|REPORT_ERRORS|STREAM_OPEN_FOR_INCLUDE, opened_path); } /* }}} */ @@ -1237,10 +1235,8 @@ 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) +static void php_message_handler_for_zend(long message, void *data TSRMLS_DC) { - TSRMLS_FETCH(); - switch (message) { case ZMSG_FAILED_INCLUDE_FOPEN: php_error_docref("function.include" TSRMLS_CC, E_WARNING, "Failed opening '%s' for inclusion (include_path='%s')", php_strip_url_passwd((char *) data), STR_PRINT(PG(include_path))); @@ -1838,7 +1834,7 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod zuf.vspprintf_function = vspprintf; zuf.getenv_function = sapi_getenv; zuf.resolve_path_function = php_resolve_path_for_zend; - zend_startup(&zuf, NULL); + zend_startup(&zuf, NULL TSRMLS_CC); #ifdef ZTS executor_globals = ts_resource(executor_globals_id); -- 2.50.1