diff options
59 files changed, 190 insertions, 192 deletions
diff --git a/Zend/zend.h b/Zend/zend.h index 832bd6e7dc..dd04aab63e 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -52,8 +52,8 @@ # define HANDLE_UNBLOCK_INTERRUPTIONS() ZEND_SIGNAL_UNBLOCK_INTERRUPTIONS() #endif -#define INTERNAL_FUNCTION_PARAMETERS zend_execute_data *execute_data, zval *return_value TSRMLS_DC -#define INTERNAL_FUNCTION_PARAM_PASSTHRU execute_data, return_value TSRMLS_CC +#define INTERNAL_FUNCTION_PARAMETERS zend_execute_data *execute_data, zval *return_value +#define INTERNAL_FUNCTION_PARAM_PASSTHRU execute_data, return_value #define USED_RET() \ (!EX(prev_execute_data) || \ diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 5ec025ee6d..1ce393f950 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2116,7 +2116,6 @@ ZEND_API int is_zend_mm(void) # define _ZEND_BIN_ALLOCATOR(_num, _size, _elements, _pages, x, y) \ ZEND_API void* ZEND_FASTCALL _emalloc_ ## _size(void) { \ - TSRMLS_FETCH(); \ ZEND_MM_CUSTOM_ALLOCATOR(_size); \ return zend_mm_alloc_small(AG(mm_heap), _size, _num ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); \ } @@ -2140,7 +2139,6 @@ ZEND_API void* ZEND_FASTCALL _emalloc_huge(size_t size) #if ZEND_DEBUG # define _ZEND_BIN_FREE(_num, _size, _elements, _pages, x, y) \ ZEND_API void ZEND_FASTCALL _efree_ ## _size(void *ptr) { \ - TSRMLS_FETCH(); \ ZEND_MM_CUSTOM_DEALLOCATOR(ptr); \ { \ size_t page_offset = ZEND_MM_ALIGNED_OFFSET(ptr, ZEND_MM_CHUNK_SIZE); \ @@ -2155,7 +2153,6 @@ ZEND_API void* ZEND_FASTCALL _emalloc_huge(size_t size) #else # define _ZEND_BIN_FREE(_num, _size, _elements, _pages, x, y) \ ZEND_API void ZEND_FASTCALL _efree_ ## _size(void *ptr) { \ - TSRMLS_FETCH(); \ ZEND_MM_CUSTOM_DEALLOCATOR(ptr); \ { \ zend_mm_chunk *chunk = (zend_mm_chunk*)ZEND_MM_ALIGNED_BASE(ptr, ZEND_MM_CHUNK_SIZE); \ @@ -2225,7 +2222,7 @@ ZEND_API void* ZEND_FASTCALL _erealloc(void *ptr, size_t size, int allow_failure return zend_mm_realloc_heap(AG(mm_heap), ptr, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); } -ZEND_API size_t ZEND_FASTCALL _zend_mem_block_size(void *ptr TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) +ZEND_API size_t ZEND_FASTCALL _zend_mem_block_size(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) { if (UNEXPECTED(AG(mm_heap)->use_custom_heap)) { return 0; diff --git a/Zend/zend_alloc.h b/Zend/zend_alloc.h index 3c5d2f6684..fddade0d1e 100644 --- a/Zend/zend_alloc.h +++ b/Zend/zend_alloc.h @@ -64,7 +64,7 @@ ZEND_API void* ZEND_FASTCALL _safe_erealloc(void *ptr, size_t nmemb, size_t siz ZEND_API void* ZEND_FASTCALL _safe_realloc(void *ptr, size_t nmemb, size_t size, size_t offset); ZEND_API char* ZEND_FASTCALL _estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC; ZEND_API char* ZEND_FASTCALL _estrndup(const char *s, size_t length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC; -ZEND_API size_t ZEND_FASTCALL _zend_mem_block_size(void *ptr TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); +ZEND_API size_t ZEND_FASTCALL _zend_mem_block_size(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); #include "zend_alloc_sizes.h" @@ -150,7 +150,7 @@ ZEND_API void ZEND_FASTCALL _efree_huge(void *, size_t size); #define erealloc_recoverable(ptr, size) _erealloc((ptr), (size), 1 ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC) #define estrdup(s) _estrdup((s) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC) #define estrndup(s, length) _estrndup((s), (length) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC) -#define zend_mem_block_size(ptr) _zend_mem_block_size((ptr) TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC) +#define zend_mem_block_size(ptr) _zend_mem_block_size((ptr) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC) /* Relay wrapper macros */ #define emalloc_rel(size) _emalloc((size) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC) @@ -162,7 +162,7 @@ ZEND_API void ZEND_FASTCALL _efree_huge(void *, size_t size); #define safe_erealloc_rel(ptr, nmemb, size, offset) _safe_erealloc((ptr), (nmemb), (size), (offset) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC) #define estrdup_rel(s) _estrdup((s) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC) #define estrndup_rel(s, length) _estrndup((s), (length) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC) -#define zend_mem_block_size_rel(ptr) _zend_mem_block_size((ptr) TSRMLS_CC ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC) +#define zend_mem_block_size_rel(ptr) _zend_mem_block_size((ptr) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC) zend_always_inline static void * __zend_malloc(size_t len) { diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 686788cded..2987b8cc3f 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -607,7 +607,7 @@ void *zend_hash_find_ptr_lc(HashTable *ht, const char *str, size_t len) { zend_string *zend_resolve_non_class_name( zend_string *name, uint32_t type, zend_bool *is_fully_qualified, - zend_bool case_sensitive, HashTable *current_import_sub TSRMLS_DC + zend_bool case_sensitive, HashTable *current_import_sub ) { char *compound; *is_fully_qualified = 0; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index d2f9254675..d01be0eb72 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -120,8 +120,8 @@ void zend_compile_var(znode *node, zend_ast *ast, uint32_t type); void zend_eval_const_expr(zend_ast **ast_ptr); void zend_const_expr_to_zval(zval *result, zend_ast *ast); -#define ZEND_OPCODE_HANDLER_ARGS zend_execute_data *execute_data TSRMLS_DC -#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU execute_data TSRMLS_CC +#define ZEND_OPCODE_HANDLER_ARGS zend_execute_data *execute_data +#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU execute_data typedef int (*user_opcode_handler_t) (ZEND_OPCODE_HANDLER_ARGS); typedef int (ZEND_FASTCALL *opcode_handler_t) (ZEND_OPCODE_HANDLER_ARGS); diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h index b757af642e..96f1e7598f 100644 --- a/Zend/zend_modules.h +++ b/Zend/zend_modules.h @@ -26,12 +26,12 @@ #include "zend_compile.h" #include "zend_build.h" -#define INIT_FUNC_ARGS int type, int module_number TSRMLS_DC -#define INIT_FUNC_ARGS_PASSTHRU type, module_number TSRMLS_CC -#define SHUTDOWN_FUNC_ARGS int type, int module_number TSRMLS_DC -#define SHUTDOWN_FUNC_ARGS_PASSTHRU type, module_number TSRMLS_CC -#define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module TSRMLS_DC -#define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module TSRMLS_CC +#define INIT_FUNC_ARGS int type, int module_number +#define INIT_FUNC_ARGS_PASSTHRU type, module_number +#define SHUTDOWN_FUNC_ARGS int type, int module_number +#define SHUTDOWN_FUNC_ARGS_PASSTHRU type, module_number +#define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module +#define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module #define ZEND_MODULE_API_NO 20141001 #ifdef ZTS diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index 2eca1421a9..5b1d22edcc 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -331,7 +331,7 @@ static opcode_handler_t zend_vm_get_opcode_handler(zend_uchar opcode, const zend #define ZEND_VM_LEAVE() return 2 #define ZEND_VM_DISPATCH(opcode, opline) return zend_vm_get_opcode_handler(opcode, opline)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); -#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL execute_data TSRMLS_CC +#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL execute_data ZEND_API void execute_ex(zend_execute_data *execute_data) { diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php index 331286b3d8..4d2ba3a706 100644 --- a/Zend/zend_vm_gen.php +++ b/Zend/zend_vm_gen.php @@ -139,7 +139,7 @@ $op1_get_zval_ptr = array( "VAR" => "_get_zval_ptr_var(opline->op1.var, execute_data, &free_op1)", "CONST" => "EX_CONSTANT(opline->op1)", "UNUSED" => "NULL", - "CV" => "_get_zval_ptr_cv_\\1(execute_data, opline->op1.var TSRMLS_CC)", + "CV" => "_get_zval_ptr_cv_\\1(execute_data, opline->op1.var)", "TMPVAR" => "_get_zval_ptr_var(opline->op1.var, execute_data, &free_op1)", ); @@ -149,7 +149,7 @@ $op2_get_zval_ptr = array( "VAR" => "_get_zval_ptr_var(opline->op2.var, execute_data, &free_op2)", "CONST" => "EX_CONSTANT(opline->op2)", "UNUSED" => "NULL", - "CV" => "_get_zval_ptr_cv_\\1(execute_data, opline->op2.var TSRMLS_CC)", + "CV" => "_get_zval_ptr_cv_\\1(execute_data, opline->op2.var)", "TMPVAR" => "_get_zval_ptr_var(opline->op2.var, execute_data, &free_op2)", ); @@ -159,7 +159,7 @@ $op1_get_zval_ptr_ptr = array( "VAR" => "_get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1)", "CONST" => "NULL", "UNUSED" => "NULL", - "CV" => "_get_zval_ptr_cv_\\1(execute_data, opline->op1.var TSRMLS_CC)", + "CV" => "_get_zval_ptr_cv_\\1(execute_data, opline->op1.var)", "TMPVAR" => "???", ); @@ -169,7 +169,7 @@ $op2_get_zval_ptr_ptr = array( "VAR" => "_get_zval_ptr_ptr_var(opline->op2.var, execute_data, &free_op2)", "CONST" => "NULL", "UNUSED" => "NULL", - "CV" => "_get_zval_ptr_cv_\\1(execute_data, opline->op2.var TSRMLS_CC)", + "CV" => "_get_zval_ptr_cv_\\1(execute_data, opline->op2.var)", "TMPVAR" => "???", ); @@ -179,7 +179,7 @@ $op1_get_zval_ptr_deref = array( "VAR" => "_get_zval_ptr_var_deref(opline->op1.var, execute_data, &free_op1)", "CONST" => "EX_CONSTANT(opline->op1)", "UNUSED" => "NULL", - "CV" => "_get_zval_ptr_cv_deref_\\1(execute_data, opline->op1.var TSRMLS_CC)", + "CV" => "_get_zval_ptr_cv_deref_\\1(execute_data, opline->op1.var)", "TMPVAR" => "???", ); @@ -189,7 +189,7 @@ $op2_get_zval_ptr_deref = array( "VAR" => "_get_zval_ptr_var_deref(opline->op2.var, execute_data, &free_op2)", "CONST" => "EX_CONSTANT(opline->op2)", "UNUSED" => "NULL", - "CV" => "_get_zval_ptr_cv_deref_\\1(execute_data, opline->op2.var TSRMLS_CC)", + "CV" => "_get_zval_ptr_cv_deref_\\1(execute_data, opline->op2.var)", "TMPVAR" => "???", ); @@ -199,7 +199,7 @@ $op1_get_zval_ptr_ptr_undef = array( "VAR" => "_get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1)", "CONST" => "NULL", "UNUSED" => "NULL", - "CV" => "_get_zval_ptr_cv_undef_\\1(execute_data, opline->op1.var TSRMLS_CC)", + "CV" => "_get_zval_ptr_cv_undef_\\1(execute_data, opline->op1.var)", "TMPVAR" => "???", ); @@ -209,7 +209,7 @@ $op2_get_zval_ptr_ptr_undef = array( "VAR" => "_get_zval_ptr_ptr_var(opline->op2.var, execute_data, &free_op2)", "CONST" => "NULL", "UNUSED" => "NULL", - "CV" => "_get_zval_ptr_cv_undef_\\1(execute_data, opline->op2.var TSRMLS_CC)", + "CV" => "_get_zval_ptr_cv_undef_\\1(execute_data, opline->op2.var)", "TMPVAR" => "???", ); @@ -219,7 +219,7 @@ $op1_get_obj_zval_ptr = array( "VAR" => "_get_zval_ptr_var(opline->op1.var, execute_data, &free_op1)", "CONST" => "EX_CONSTANT(opline->op1)", "UNUSED" => "_get_obj_zval_ptr_unused(execute_data)", - "CV" => "_get_zval_ptr_cv_\\1(execute_data, opline->op1.var TSRMLS_CC)", + "CV" => "_get_zval_ptr_cv_\\1(execute_data, opline->op1.var)", "TMPVAR" => "_get_zval_ptr_var(opline->op1.var, execute_data, &free_op1)", ); @@ -229,7 +229,7 @@ $op2_get_obj_zval_ptr = array( "VAR" => "_get_zval_ptr_var(opline->op2.var, execute_data, &free_op2)", "CONST" => "EX_CONSTANT(opline->op2)", "UNUSED" => "_get_obj_zval_ptr_unused(execute_data)", - "CV" => "_get_zval_ptr_cv_\\1(execute_data, opline->op2.var TSRMLS_CC)", + "CV" => "_get_zval_ptr_cv_\\1(execute_data, opline->op2.var)", "TMPVAR" => "_get_zval_ptr_var(opline->op2.var, execute_data, &free_op2)", ); @@ -239,7 +239,7 @@ $op1_get_obj_zval_ptr_deref = array( "VAR" => "_get_zval_ptr_var_deref(opline->op1.var, execute_data, &free_op1)", "CONST" => "EX_CONSTANT(opline->op1)", "UNUSED" => "_get_obj_zval_ptr_unused(execute_data)", - "CV" => "_get_zval_ptr_cv_deref_\\1(execute_data, opline->op1.var TSRMLS_CC)", + "CV" => "_get_zval_ptr_cv_deref_\\1(execute_data, opline->op1.var)", "TMPVAR" => "???", ); @@ -249,7 +249,7 @@ $op2_get_obj_zval_ptr_deref = array( "VAR" => "_get_zval_ptr_var_deref(opline->op2.var, execute_data, &free_op2)", "CONST" => "EX_CONSTANT(opline->op2)", "UNUSED" => "_get_obj_zval_ptr_unused(execute_data)", - "CV" => "_get_zval_ptr_cv_deref_\\1(execute_data, opline->op2.var TSRMLS_CC)", + "CV" => "_get_zval_ptr_cv_deref_\\1(execute_data, opline->op2.var)", "TMPVAR" => "???", ); @@ -259,7 +259,7 @@ $op1_get_obj_zval_ptr_ptr = array( "VAR" => "_get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1)", "CONST" => "NULL", "UNUSED" => "_get_obj_zval_ptr_unused(execute_data)", - "CV" => "_get_zval_ptr_cv_\\1(execute_data, opline->op1.var TSRMLS_CC)", + "CV" => "_get_zval_ptr_cv_\\1(execute_data, opline->op1.var)", "TMPVAR" => "???", ); @@ -269,7 +269,7 @@ $op2_get_obj_zval_ptr_ptr = array( "VAR" => "_get_zval_ptr_ptr_var(opline->op2.var, execute_data, &free_op2)", "CONST" => "NULL", "UNUSED" => "_get_obj_zval_ptr_unused(execute_data)", - "CV" => "_get_zval_ptr_cv_\\1(execute_data, opline->op2.var TSRMLS_CC)", + "CV" => "_get_zval_ptr_cv_\\1(execute_data, opline->op2.var)", "TMPVAR" => "???", ); @@ -279,7 +279,7 @@ $op1_get_obj_zval_ptr_ptr_undef = array( "VAR" => "_get_zval_ptr_ptr_var(opline->op1.var, execute_data, &free_op1)", "CONST" => "NULL", "UNUSED" => "_get_obj_zval_ptr_unused(execute_data)", - "CV" => "_get_zval_ptr_cv_undef_\\1(execute_data, opline->op1.var TSRMLS_CC)", + "CV" => "_get_zval_ptr_cv_undef_\\1(execute_data, opline->op1.var)", "TMPVAR" => "???", ); @@ -289,7 +289,7 @@ $op2_get_obj_zval_ptr_ptr_undef = array( "VAR" => "_get_zval_ptr_ptr_var(opline->op2.var, execute_data, &free_op2)", "CONST" => "NULL", "UNUSED" => "_get_obj_zval_ptr_unused(execute_data)", - "CV" => "_get_zval_ptr_cv_undef_\\1(execute_data, opline->op2.var TSRMLS_CC)", + "CV" => "_get_zval_ptr_cv_undef_\\1(execute_data, opline->op2.var)", "TMPVAR" => "???", ); @@ -956,7 +956,8 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name, out($f,"#define ZEND_VM_ENTER() return 1\n"); out($f,"#define ZEND_VM_LEAVE() return 2\n"); out($f,"#define ZEND_VM_DISPATCH(opcode, opline) return zend_vm_get_opcode_handler(opcode, opline)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n\n"); - out($f,"#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL execute_data TSRMLS_CC\n"); + out($f,"#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL execute_data +"); break; case ZEND_VM_KIND_SWITCH: out($f,"\n"); @@ -981,7 +982,8 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name, out($f,"#define ZEND_VM_ENTER() execute_data = EG(current_execute_data); LOAD_OPLINE(); ZEND_VM_CONTINUE()\n"); out($f,"#define ZEND_VM_LEAVE() ZEND_VM_CONTINUE()\n"); out($f,"#define ZEND_VM_DISPATCH(opcode, opline) dispatch_handler = zend_vm_get_opcode_handler(opcode, opline); goto zend_vm_dispatch;\n\n"); - out($f,"#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL execute_data TSRMLS_CC\n"); + out($f,"#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL execute_data +"); break; case ZEND_VM_KIND_GOTO: out($f,"\n"); @@ -1012,7 +1014,8 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name, out($f,"#define ZEND_VM_ENTER() execute_data = EG(current_execute_data); LOAD_OPLINE(); ZEND_VM_CONTINUE()\n"); out($f,"#define ZEND_VM_LEAVE() ZEND_VM_CONTINUE()\n"); out($f,"#define ZEND_VM_DISPATCH(opcode, opline) goto *(void**)(zend_vm_get_opcode_handler(opcode, opline));\n\n"); - out($f,"#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL execute_data TSRMLS_CC\n"); + out($f,"#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL execute_data +"); break; } break; @@ -1063,7 +1066,7 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name, // Emit code that dispatches to opcode handler switch ($kind) { case ZEND_VM_KIND_CALL: - out($f, $m[1]."if (UNEXPECTED((ret = OPLINE->handler(execute_data TSRMLS_CC)) != 0))".$m[3]."\n"); + out($f, $m[1]."if (UNEXPECTED((ret = OPLINE->handler(execute_data)) != 0))".$m[3]."\n"); break; case ZEND_VM_KIND_SWITCH: out($f, $m[1]."dispatch_handler = OPLINE->handler;\nzend_vm_dispatch:\n".$m[1]."switch ((int)dispatch_handler)".$m[3]."\n"); @@ -1105,8 +1108,8 @@ function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name, if ($kind == ZEND_VM_KIND_GOTO) { // Labels are defined in the executor itself, so we call it // with execute_data NULL and it sets zend_opcode_handlers array - out($f,$prolog."TSRMLS_FETCH();\n"); - out($f,$prolog.$executor_name."_ex(NULL TSRMLS_CC);\n"); + out($f,$prolog.""); + out($f,$prolog.$executor_name."_ex(NULL);\n"); } else { if ($old) { // Reserving space for user-defined opcodes @@ -1452,7 +1455,8 @@ function gen_vm($def, $skel) { out($f,"#define ZEND_VM_ENTER() return 1\n"); out($f,"#define ZEND_VM_LEAVE() return 2\n"); out($f,"#define ZEND_VM_DISPATCH(opcode, opline) return zend_vm_get_opcode_handler(opcode, opline)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n\n"); - out($f,"#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL execute_data TSRMLS_CC\n\n"); + out($f,"#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL execute_data +\n"); } foreach ($export as $dsk) { list($kind, $func, $name) = $dsk; diff --git a/ext/bz2/bz2_filter.c b/ext/bz2/bz2_filter.c index 8b9ee99804..7f7c53cff3 100644 --- a/ext/bz2/bz2_filter.c +++ b/ext/bz2/bz2_filter.c @@ -71,7 +71,7 @@ static php_stream_filter_status_t php_bz2_decompress_filter( php_stream_bucket_brigade *buckets_out, size_t *bytes_consumed, int flags - TSRMLS_DC) + ) { php_bz2_filter_data *data; php_stream_bucket *bucket; @@ -209,7 +209,7 @@ static php_stream_filter_status_t php_bz2_compress_filter( php_stream_bucket_brigade *buckets_out, size_t *bytes_consumed, int flags - TSRMLS_DC) + ) { php_bz2_filter_data *data; php_stream_bucket *bucket; diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 3a2d2fcb76..b1e6167b2f 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -50,11 +50,11 @@ #undef EXIF_DEBUG #ifdef EXIF_DEBUG -#define EXIFERR_DC , const char *_file, size_t _line TSRMLS_DC -#define EXIFERR_CC , __FILE__, __LINE__ TSRMLS_CC +#define EXIFERR_DC , const char *_file, size_t _line +#define EXIFERR_CC , __FILE__, __LINE__ #else -#define EXIFERR_DC TSRMLS_DC -#define EXIFERR_CC TSRMLS_CC +#define EXIFERR_DC +#define EXIFERR_CC #endif #undef EXIF_JPEG2000 @@ -2644,7 +2644,7 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP ByteCount, zend_multibyte_fetch_encoding(ImageInfo->encode_unicode), zend_multibyte_fetch_encoding(decode) - TSRMLS_CC) == (size_t)-1) { + ) == (size_t)-1) { len = exif_process_string_raw(pszInfoPtr, szValuePtr, ByteCount); } return len; @@ -2665,7 +2665,7 @@ static int exif_process_user_comment(image_info_type *ImageInfo, char **pszInfoP ByteCount, zend_multibyte_fetch_encoding(ImageInfo->encode_jis), zend_multibyte_fetch_encoding(ImageInfo->motorola_intel ? ImageInfo->decode_jis_be : ImageInfo->decode_jis_le) - TSRMLS_CC) == (size_t)-1) { + ) == (size_t)-1) { len = exif_process_string_raw(pszInfoPtr, szValuePtr, ByteCount); } return len; @@ -2704,7 +2704,7 @@ static int exif_process_unicode(image_info_type *ImageInfo, xp_field_type *xp_fi ByteCount, zend_multibyte_fetch_encoding(ImageInfo->encode_unicode), zend_multibyte_fetch_encoding(ImageInfo->motorola_intel ? ImageInfo->decode_unicode_be : ImageInfo->decode_unicode_le) - TSRMLS_CC) == (size_t)-1) { + ) == (size_t)-1) { xp_field->size = exif_process_string_raw(&xp_field->value, szValuePtr, ByteCount); } return xp_field->size; diff --git a/ext/filter/php_filter.h b/ext/filter/php_filter.h index 7ddb009b87..f9735be76e 100644 --- a/ext/filter/php_filter.h +++ b/ext/filter/php_filter.h @@ -71,7 +71,7 @@ ZEND_TSRMLS_CACHE_EXTERN; #endif -#define PHP_INPUT_FILTER_PARAM_DECL zval *value, zend_long flags, zval *option_array, char *charset TSRMLS_DC +#define PHP_INPUT_FILTER_PARAM_DECL zval *value, zend_long flags, zval *option_array, char *charset void php_filter_int(PHP_INPUT_FILTER_PARAM_DECL); void php_filter_boolean(PHP_INPUT_FILTER_PARAM_DECL); void php_filter_float(PHP_INPUT_FILTER_PARAM_DECL); diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c index beb016d84f..1b9846a576 100644 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@ -477,7 +477,7 @@ static void shift_operator_helper(gmp_binary_ui_op_t op, zval *return_value, zva #define DO_BINARY_UI_OP_EX(op, uop, check_b_zero) \ gmp_zval_binary_ui_op( \ result, op1, op2, op, (gmp_binary_ui_op_t) uop, \ - check_b_zero TSRMLS_CC \ + check_b_zero \ ); \ return SUCCESS; diff --git a/ext/interbase/ibase_query.c b/ext/interbase/ibase_query.c index e7b6a834b2..95c462e55c 100644 --- a/ext/interbase/ibase_query.c +++ b/ext/interbase/ibase_query.c @@ -1107,7 +1107,7 @@ PHP_FUNCTION(ibase_query) if (PG(sql_safe_mode)) { _php_ibase_module_error("CREATE DATABASE is not allowed in SQL safe mode" - TSRMLS_CC); + ); } else if (((l = INI_INT("ibase.max_links")) != -1) && (IBG(num_links) >= l)) { _php_ibase_module_error("CREATE DATABASE is not allowed: maximum link count " @@ -1572,7 +1572,7 @@ static void _php_ibase_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int fetch_type) item == isc_info_error || i >= sizeof(bl_info)) { _php_ibase_module_error("Could not determine BLOB size (internal error)" - TSRMLS_CC); + ); goto _php_ibase_fetch_error; } diff --git a/ext/interbase/interbase.c b/ext/interbase/interbase.c index cb944c9dde..a91bc320cf 100644 --- a/ext/interbase/interbase.c +++ b/ext/interbase/interbase.c @@ -560,7 +560,7 @@ void _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAMETERS, /* {{{ */ ZEND_FETCH_RESOURCE(*trans, ibase_trans *, link_id, -1, LE_TRANS, le_trans); if ((*trans)->link_cnt > 1) { _php_ibase_module_error("Link id is ambiguous: transaction spans multiple connections." - TSRMLS_CC); + ); return; } *ib_link = (*trans)->db_link[0]; diff --git a/ext/interbase/php_ibase_udf.c b/ext/interbase/php_ibase_udf.c index 63c6a89fea..bd8ba550d5 100644 --- a/ext/interbase/php_ibase_udf.c +++ b/ext/interbase/php_ibase_udf.c @@ -127,7 +127,7 @@ pthread_mutex_t mtx_res = PTHREAD_MUTEX_INITIALIZER; static void __attribute__((constructor)) init() { - php_embed_init(0, NULL PTSRMLS_CC); + php_embed_init(0, NULL P); } static void __attribute__((destructor)) fini() diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index f779e6a5b0..881c1ae2fd 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -549,7 +549,7 @@ mysqlnd_run_authentication( zend_ulong mysql_flags, zend_bool silent, zend_bool is_change_user - TSRMLS_DC) + ) { enum_func_status ret = FAIL; zend_bool first_call = TRUE; @@ -622,7 +622,7 @@ mysqlnd_run_authentication( scrambled_data, scrambled_data_len, &switch_to_auth_protocol, &switch_to_auth_protocol_len, &switch_to_auth_protocol_data, &switch_to_auth_protocol_data_len - TSRMLS_CC); + ); } else { ret = mysqlnd_auth_change_user(conn, user, strlen(user), passwd, passwd_len, db, db_len, silent, first_call, @@ -679,7 +679,7 @@ mysqlnd_connect_run_authentication( const MYSQLND_PACKET_GREET * const greet_packet, const MYSQLND_OPTIONS * const options, zend_ulong mysql_flags - TSRMLS_DC) + ) { enum_func_status ret = FAIL; DBG_ENTER("mysqlnd_connect_run_authentication"); @@ -2302,7 +2302,7 @@ static enum_func_status MYSQLND_METHOD(mysqlnd_conn_data, set_client_option)(MYSQLND_CONN_DATA * const conn, enum mysqlnd_option option, const char * const value - TSRMLS_DC) + ) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, set_client_option); enum_func_status ret = PASS; @@ -2473,7 +2473,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, set_client_option_2d)(MYSQLND_CONN_DATA * cons enum mysqlnd_option option, const char * const key, const char * const value - TSRMLS_DC) + ) { size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, set_client_option_2d); enum_func_status ret = PASS; @@ -2616,10 +2616,10 @@ MYSQLND_METHOD(mysqlnd_conn_data, store_result)(MYSQLND_CONN_DATA * const conn, /* {{{ mysqlnd_conn_data::get_connection_stats */ static void MYSQLND_METHOD(mysqlnd_conn_data, get_connection_stats)(const MYSQLND_CONN_DATA * const conn, - zval * return_value TSRMLS_DC ZEND_FILE_LINE_DC) + zval * return_value ZEND_FILE_LINE_DC) { DBG_ENTER("mysqlnd_conn_data::get_connection_stats"); - mysqlnd_fill_stats_hash(conn->stats, mysqlnd_stats_values_names, return_value TSRMLS_CC ZEND_FILE_LINE_CC); + mysqlnd_fill_stats_hash(conn->stats, mysqlnd_stats_values_names, return_value ZEND_FILE_LINE_CC); DBG_VOID_RETURN; } /* }}} */ diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h index 829177a7c1..e9a4b11638 100644 --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h @@ -104,12 +104,12 @@ PHPAPI MYSQLND * mysqlnd_connect(MYSQLND * conn, PHPAPI void _mysqlnd_debug(const char *mode); /* Query */ -#define mysqlnd_fetch_into(result, flags, ret_val, ext) (result)->m.fetch_into((result), (flags), (ret_val), (ext) TSRMLS_CC ZEND_FILE_LINE_CC) +#define mysqlnd_fetch_into(result, flags, ret_val, ext) (result)->m.fetch_into((result), (flags), (ret_val), (ext) ZEND_FILE_LINE_CC) #define mysqlnd_fetch_row_c(result) (result)->m.fetch_row_c((result)) -#define mysqlnd_fetch_all(result, flags, return_value) (result)->m.fetch_all((result), (flags), (return_value) TSRMLS_CC ZEND_FILE_LINE_CC) +#define mysqlnd_fetch_all(result, flags, return_value) (result)->m.fetch_all((result), (flags), (return_value) ZEND_FILE_LINE_CC) #define mysqlnd_result_fetch_field_data(res,offset,ret) (res)->m.fetch_field_data((res), (offset), (ret)) -#define mysqlnd_get_connection_stats(conn, values) ((conn)->data)->m->get_statistics((conn)->data, (values) TSRMLS_CC ZEND_FILE_LINE_CC) -#define mysqlnd_get_client_stats(values) _mysqlnd_get_client_stats((values) TSRMLS_CC ZEND_FILE_LINE_CC) +#define mysqlnd_get_connection_stats(conn, values) ((conn)->data)->m->get_statistics((conn)->data, (values) ZEND_FILE_LINE_CC) +#define mysqlnd_get_client_stats(values) _mysqlnd_get_client_stats((values) ZEND_FILE_LINE_CC) #define mysqlnd_close(conn,is_forced) (conn)->m->close((conn), (is_forced)) #define mysqlnd_query(conn, query_str, query_len) ((conn)->data)->m->query((conn)->data, (query_str), (query_len)) @@ -257,7 +257,7 @@ PHPAPI zend_ulong mysqlnd_old_escape_string(char * newstr, const char * escapest /* Performance statistics */ -PHPAPI void _mysqlnd_get_client_stats(zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC); +PHPAPI void _mysqlnd_get_client_stats(zval *return_value ZEND_FILE_LINE_DC); /* double check the class name to avoid naming conflicts when using these: */ #define MYSQLND_METHOD(class, method) php_##class##_##method##_pub diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c index 2196278f2b..616c80dfee 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -168,7 +168,7 @@ mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn, size_t * switch_to_auth_protocol_len, zend_uchar ** switch_to_auth_protocol_data, size_t * switch_to_auth_protocol_data_len - TSRMLS_DC) + ) { enum_func_status ret = FAIL; const MYSQLND_CHARSET * old_cs = conn->charset; diff --git a/ext/mysqlnd/mysqlnd_priv.h b/ext/mysqlnd/mysqlnd_priv.h index 51e4b33813..290c7b14b9 100644 --- a/ext/mysqlnd/mysqlnd_priv.h +++ b/ext/mysqlnd/mysqlnd_priv.h @@ -219,7 +219,7 @@ mysqlnd_auth_handshake(MYSQLND_CONN_DATA * conn, size_t * switch_to_auth_protocol_len, zend_uchar ** switch_to_auth_protocol_data, size_t * switch_to_auth_protocol_data_len - TSRMLS_DC); + ); enum_func_status mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn, @@ -238,7 +238,7 @@ mysqlnd_auth_change_user(MYSQLND_CONN_DATA * const conn, size_t * switch_to_auth_protocol_len, zend_uchar ** switch_to_auth_protocol_data, size_t * switch_to_auth_protocol_data_len - TSRMLS_DC); + ); #endif /* MYSQLND_PRIV_H */ diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index 5ad5837875..8e82b22715 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -1714,7 +1714,7 @@ MYSQLND_METHOD(mysqlnd_res, field_tell)(const MYSQLND_RES * const result) static void MYSQLND_METHOD(mysqlnd_res, fetch_into)(MYSQLND_RES * result, const unsigned int flags, zval *return_value, - enum_mysqlnd_extension extension TSRMLS_DC ZEND_FILE_LINE_DC) + enum_mysqlnd_extension extension ZEND_FILE_LINE_DC) { zend_bool fetched_anything; @@ -1773,7 +1773,7 @@ MYSQLND_METHOD(mysqlnd_res, fetch_row_c)(MYSQLND_RES * result) /* {{{ mysqlnd_res::fetch_all */ static void -MYSQLND_METHOD(mysqlnd_res, fetch_all)(MYSQLND_RES * result, const unsigned int flags, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC) +MYSQLND_METHOD(mysqlnd_res, fetch_all)(MYSQLND_RES * result, const unsigned int flags, zval *return_value ZEND_FILE_LINE_DC) { zval row; zend_ulong i = 0; diff --git a/ext/mysqlnd/mysqlnd_statistics.c b/ext/mysqlnd/mysqlnd_statistics.c index 048a5fe199..de8014ccea 100644 --- a/ext/mysqlnd/mysqlnd_statistics.c +++ b/ext/mysqlnd/mysqlnd_statistics.c @@ -197,7 +197,7 @@ const MYSQLND_STRING mysqlnd_stats_values_names[STAT_LAST] = /* {{{ mysqlnd_fill_stats_hash */ PHPAPI void -mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, const MYSQLND_STRING * names, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC) +mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, const MYSQLND_STRING * names, zval *return_value ZEND_FILE_LINE_DC) { unsigned int i; @@ -214,7 +214,7 @@ mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, const MYSQLND_STRING /* {{{ _mysqlnd_get_client_stats */ PHPAPI void -_mysqlnd_get_client_stats(zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC) +_mysqlnd_get_client_stats(zval *return_value ZEND_FILE_LINE_DC) { MYSQLND_STATS stats, *stats_ptr = mysqlnd_global_stats; DBG_ENTER("_mysqlnd_get_client_stats"); @@ -222,7 +222,7 @@ _mysqlnd_get_client_stats(zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC) memset(&stats, 0, sizeof(stats)); stats_ptr = &stats; } - mysqlnd_fill_stats_hash(stats_ptr, mysqlnd_stats_values_names, return_value TSRMLS_CC ZEND_FILE_LINE_CC); + mysqlnd_fill_stats_hash(stats_ptr, mysqlnd_stats_values_names, return_value ZEND_FILE_LINE_CC); DBG_VOID_RETURN; } /* }}} */ diff --git a/ext/mysqlnd/mysqlnd_statistics.h b/ext/mysqlnd/mysqlnd_statistics.h index db83dda4cb..e151148396 100644 --- a/ext/mysqlnd/mysqlnd_statistics.h +++ b/ext/mysqlnd/mysqlnd_statistics.h @@ -157,7 +157,7 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[]; #endif /* MYSQLND_CORE_STATISTICS_DISABLED */ -PHPAPI void mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, const MYSQLND_STRING * names, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC); +PHPAPI void mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, const MYSQLND_STRING * names, zval *return_value ZEND_FILE_LINE_DC); PHPAPI void mysqlnd_stats_init(MYSQLND_STATS ** stats, size_t statistic_count); PHPAPI void mysqlnd_stats_end(MYSQLND_STATS * stats); diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index c7fc0a87be..ca5a269961 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -247,7 +247,7 @@ typedef enum_func_status (*mysqlnd_fetch_row_func)(MYSQLND_RES *result, void * param, const unsigned int flags, zend_bool * fetched_anything - TSRMLS_DC); + ); typedef struct st_mysqlnd_stats MYSQLND_STATS; @@ -439,7 +439,7 @@ typedef unsigned int (*func_mysqlnd_conn_data__get_error_no)(const MYSQLND_CONN typedef const char * (*func_mysqlnd_conn_data__get_error_str)(const MYSQLND_CONN_DATA * const conn); typedef const char * (*func_mysqlnd_conn_data__get_sqlstate)(const MYSQLND_CONN_DATA * const conn); typedef uint64_t (*func_mysqlnd_conn_data__get_thread_id)(const MYSQLND_CONN_DATA * const conn); -typedef void (*func_mysqlnd_conn_data__get_statistics)(const MYSQLND_CONN_DATA * const conn, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC); +typedef void (*func_mysqlnd_conn_data__get_statistics)(const MYSQLND_CONN_DATA * const conn, zval *return_value ZEND_FILE_LINE_DC); typedef zend_ulong (*func_mysqlnd_conn_data__get_server_version)(const MYSQLND_CONN_DATA * const conn); typedef const char * (*func_mysqlnd_conn_data__get_server_information)(const MYSQLND_CONN_DATA * const conn); @@ -624,9 +624,9 @@ typedef enum_func_status (*func_mysqlnd_res__row_decoder)(MYSQLND_MEMORY_POOL_CH typedef MYSQLND_RES * (*func_mysqlnd_res__use_result)(MYSQLND_RES * const result, zend_bool ps_protocol); typedef MYSQLND_RES * (*func_mysqlnd_res__store_result)(MYSQLND_RES * result, MYSQLND_CONN_DATA * const conn, const unsigned int flags); -typedef void (*func_mysqlnd_res__fetch_into)(MYSQLND_RES *result, const unsigned int flags, zval *return_value, enum_mysqlnd_extension ext TSRMLS_DC ZEND_FILE_LINE_DC); +typedef void (*func_mysqlnd_res__fetch_into)(MYSQLND_RES *result, const unsigned int flags, zval *return_value, enum_mysqlnd_extension ext ZEND_FILE_LINE_DC); typedef MYSQLND_ROW_C (*func_mysqlnd_res__fetch_row_c)(MYSQLND_RES *result); -typedef void (*func_mysqlnd_res__fetch_all)(MYSQLND_RES *result, const unsigned int flags, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC); +typedef void (*func_mysqlnd_res__fetch_all)(MYSQLND_RES *result, const unsigned int flags, zval *return_value ZEND_FILE_LINE_DC); typedef void (*func_mysqlnd_res__fetch_field_data)(MYSQLND_RES *result, unsigned int offset, zval *return_value); typedef uint64_t (*func_mysqlnd_res__num_rows)(const MYSQLND_RES * const result); typedef unsigned int (*func_mysqlnd_res__num_fields)(const MYSQLND_RES * const result); @@ -1208,7 +1208,7 @@ typedef zend_uchar * (*func_auth_plugin__get_auth_data)(struct st_mysqlnd_authen const size_t passwd_len, zend_uchar * auth_plugin_data, size_t auth_plugin_data_len, const MYSQLND_OPTIONS * const options, const MYSQLND_NET_OPTIONS * const net_options, zend_ulong mysql_flags - TSRMLS_DC); + ); struct st_mysqlnd_authentication_plugin { diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c index 01e71618e6..92128d7715 100644 --- a/ext/mysqlnd/php_mysqlnd.c +++ b/ext/mysqlnd/php_mysqlnd.c @@ -64,7 +64,7 @@ mysqlnd_minfo_dump_plugin_stats(zval *el, void * argument) zval values; snprintf(buf, sizeof(buf), "%s statistics", plugin_header->plugin_name); - mysqlnd_fill_stats_hash(plugin_header->plugin_stats.values, plugin_header->plugin_stats.names, &values TSRMLS_CC ZEND_FILE_LINE_CC); + mysqlnd_fill_stats_hash(plugin_header->plugin_stats.values, plugin_header->plugin_stats.names, &values ZEND_FILE_LINE_CC); php_info_print_table_start(); php_info_print_table_header(2, buf, ""); diff --git a/ext/opcache/Optimizer/block_pass.c b/ext/opcache/Optimizer/block_pass.c index d2dc38962a..49ca397316 100644 --- a/ext/opcache/Optimizer/block_pass.c +++ b/ext/opcache/Optimizer/block_pass.c @@ -720,7 +720,7 @@ static void zend_optimize_block(zend_code_block *block, zend_op_array *op_array, int flen = FUNCTION_CACHE->funcs[Z_LVAL(ZEND_OP1_LITERAL(fcall))].name_len; if(flen == sizeof("defined")-1 && zend_binary_strcasecmp(fname, flen, "defined", sizeof("defined")-1) == 0) { zval c; - if(zend_optimizer_get_persistent_constant(Z_STR_P(arg), &c, 0 TSRMLS_CC ELS_CC) != 0) { + if(zend_optimizer_get_persistent_constant(Z_STR_P(arg), &c, 0 ELS_CC) != 0) { literal_dtor(arg); MAKE_NOP(sv); MAKE_NOP(fcall); @@ -740,7 +740,7 @@ static void zend_optimize_block(zend_code_block *block, zend_op_array *op_array, } } else if(flen == sizeof("constant")-1 && zend_binary_strcasecmp(fname, flen, "constant", sizeof("constant")-1) == 0) { zval c; - if(zend_optimizer_get_persistent_constant(Z_STR_P(arg), &c, 1 TSRMLS_CC ELS_CC) != 0) { + if(zend_optimizer_get_persistent_constant(Z_STR_P(arg), &c, 1 ELS_CC) != 0) { literal_dtor(arg); MAKE_NOP(sv); MAKE_NOP(fcall); diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 312fb08386..6ed7c087cb 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -1370,7 +1370,7 @@ static void enable_client_sni(php_stream *stream, php_openssl_netstream_data_t * int php_openssl_setup_crypto(php_stream *stream, php_openssl_netstream_data_t *sslsock, php_stream_xport_crypto_param *cparam - TSRMLS_DC) /* {{{ */ + ) /* {{{ */ { const SSL_METHOD *method; long ssl_ctx_options; @@ -1596,7 +1596,7 @@ static int capture_peer_certs(php_stream *stream, php_openssl_netstream_data_t * static int php_openssl_enable_crypto(php_stream *stream, php_openssl_netstream_data_t *sslsock, php_stream_xport_crypto_param *cparam - TSRMLS_DC) + ) { int n; int retry = 1; @@ -1913,7 +1913,7 @@ static inline int php_openssl_tcp_sockop_accept(php_stream *stream, php_openssl_ xparam->inputs.timeout, xparam->want_errortext ? &xparam->outputs.error_text : NULL, &xparam->outputs.error_code - TSRMLS_CC); + ); if (clisock >= 0) { php_openssl_netstream_data_t *clisockdata; diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c index abd0590e1c..9cc1c7dfbf 100644 --- a/ext/pdo/pdo_dbh.c +++ b/ext/pdo/pdo_dbh.c @@ -500,7 +500,7 @@ static PHP_METHOD(PDO, prepare) pdo_raise_impl_error(dbh, NULL, "HY000", "PDO::ATTR_STATEMENT_CLASS requires format array(classname, array(ctor_args)); " "the classname must be a string specifying an existing class" - TSRMLS_CC); + ); PDO_HANDLE_DBH_ERR(); RETURN_FALSE; } @@ -522,7 +522,7 @@ static PHP_METHOD(PDO, prepare) pdo_raise_impl_error(dbh, NULL, "HY000", "PDO::ATTR_STATEMENT_CLASS requires format array(classname, ctor_args); " "ctor_args must be an array" - TSRMLS_CC); + ); PDO_HANDLE_DBH_ERR(); RETURN_FALSE; } @@ -538,7 +538,7 @@ static PHP_METHOD(PDO, prepare) if (!pdo_stmt_instantiate(dbh, return_value, dbstmt_ce, &ctor_args)) { pdo_raise_impl_error(dbh, NULL, "HY000", "failed to instantiate user-supplied statement class" - TSRMLS_CC); + ); PDO_HANDLE_DBH_ERR(); RETURN_FALSE; } @@ -756,7 +756,7 @@ static int pdo_dbh_attribute_set(pdo_dbh_t *dbh, zend_long attr, zval *value) /* if (dbh->is_persistent) { pdo_raise_impl_error(dbh, NULL, "HY000", "PDO::ATTR_STATEMENT_CLASS cannot be used with persistent PDO instances" - TSRMLS_CC); + ); PDO_HANDLE_DBH_ERR(); return FAILURE; } @@ -768,7 +768,7 @@ static int pdo_dbh_attribute_set(pdo_dbh_t *dbh, zend_long attr, zval *value) /* pdo_raise_impl_error(dbh, NULL, "HY000", "PDO::ATTR_STATEMENT_CLASS requires format array(classname, array(ctor_args)); " "the classname must be a string specifying an existing class" - TSRMLS_CC); + ); PDO_HANDLE_DBH_ERR(); return FAILURE; } @@ -794,7 +794,7 @@ static int pdo_dbh_attribute_set(pdo_dbh_t *dbh, zend_long attr, zval *value) /* pdo_raise_impl_error(dbh, NULL, "HY000", "PDO::ATTR_STATEMENT_CLASS requires format array(classname, array(ctor_args)); " "ctor_args must be an array" - TSRMLS_CC); + ); PDO_HANDLE_DBH_ERR(); return FAILURE; } diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index 397300050d..e4daca7b87 100644 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -385,7 +385,7 @@ static int really_register_bound_param(struct pdo_bound_param_data *param, pdo_s * at this time. */ if (stmt->methods->param_hook) { if (!stmt->methods->param_hook(stmt, param, PDO_PARAM_EVT_NORMALIZE - TSRMLS_CC)) { + )) { if (param->name) { zend_string_release(param->name); param->name = NULL; @@ -411,7 +411,7 @@ static int really_register_bound_param(struct pdo_bound_param_data *param, pdo_s /* tell the driver we just created a parameter */ if (stmt->methods->param_hook) { if (!stmt->methods->param_hook(stmt, pparam, PDO_PARAM_EVT_ALLOC - TSRMLS_CC)) { + )) { /* undo storage allocation; the hash will free the parameter * name if required */ if (pparam->name) { diff --git a/ext/pdo_odbc/php_pdo_odbc.h b/ext/pdo_odbc/php_pdo_odbc.h index 52e8e6f8e7..776c373c24 100644 --- a/ext/pdo_odbc/php_pdo_odbc.h +++ b/ext/pdo_odbc/php_pdo_odbc.h @@ -46,9 +46,9 @@ ZEND_END_MODULE_GLOBALS(pdo_odbc) /* In every utility function you add that needs to use variables in php_pdo_odbc_globals, call TSRMLS_FETCH(); after declaring other - variables used by that function, or better yet, pass in TSRMLS_CC + variables used by that function, or better yet, pass in after the last function argument and declare your utility function - with TSRMLS_DC after the last declared argument. Always refer to + with after the last declared argument. Always refer to the globals in your function as PDO_ODBC_G(variable). You are encouraged to rename these macros something shorter, see examples in any other php module directory. diff --git a/ext/pdo_sqlite/php_pdo_sqlite.h b/ext/pdo_sqlite/php_pdo_sqlite.h index 9413e1bb70..21977d7f2b 100644 --- a/ext/pdo_sqlite/php_pdo_sqlite.h +++ b/ext/pdo_sqlite/php_pdo_sqlite.h @@ -47,9 +47,9 @@ ZEND_END_MODULE_GLOBALS(pdo_sqlite) /* In every utility function you add that needs to use variables in php_pdo_sqlite_globals, call TSRMLS_FETCH(); after declaring other - variables used by that function, or better yet, pass in TSRMLS_CC + variables used by that function, or better yet, pass in after the last function argument and declare your utility function - with TSRMLS_DC after the last declared argument. Always refer to + with after the last declared argument. Always refer to the globals in your function as PDO_SQLITE_G(variable). You are encouraged to rename these macros something shorter, see examples in any other php module directory. diff --git a/ext/session/php_session.h b/ext/session/php_session.h index 961a3bcd91..44c03e9ecc 100644 --- a/ext/session/php_session.h +++ b/ext/session/php_session.h @@ -32,13 +32,13 @@ /* To check php_session_valid_key()/php_session_reset_id() */ #define PHP_SESSION_STRICT 1 -#define PS_OPEN_ARGS void **mod_data, const char *save_path, const char *session_name TSRMLS_DC -#define PS_CLOSE_ARGS void **mod_data TSRMLS_DC -#define PS_READ_ARGS void **mod_data, zend_string *key, zend_string **val TSRMLS_DC -#define PS_WRITE_ARGS void **mod_data, zend_string *key, zend_string *val TSRMLS_DC -#define PS_DESTROY_ARGS void **mod_data, zend_string *key TSRMLS_DC -#define PS_GC_ARGS void **mod_data, int maxlifetime, int *nrdels TSRMLS_DC -#define PS_CREATE_SID_ARGS void **mod_data TSRMLS_DC +#define PS_OPEN_ARGS void **mod_data, const char *save_path, const char *session_name +#define PS_CLOSE_ARGS void **mod_data +#define PS_READ_ARGS void **mod_data, zend_string *key, zend_string **val +#define PS_WRITE_ARGS void **mod_data, zend_string *key, zend_string *val +#define PS_DESTROY_ARGS void **mod_data, zend_string *key +#define PS_GC_ARGS void **mod_data, int maxlifetime, int *nrdels +#define PS_CREATE_SID_ARGS void **mod_data /* default create id function */ PHPAPI zend_string *php_session_create_id(PS_CREATE_SID_ARGS); @@ -198,7 +198,7 @@ ZEND_TSRMLS_CACHE_EXTERN; #endif #define PS_SERIALIZER_ENCODE_ARGS TSRMLS_D -#define PS_SERIALIZER_DECODE_ARGS const char *val, int vallen TSRMLS_DC +#define PS_SERIALIZER_DECODE_ARGS const char *val, int vallen typedef struct ps_serializer_struct { const char *name; diff --git a/ext/skeleton/php_skeleton.h b/ext/skeleton/php_skeleton.h index bf73bfcc9b..7d9b0bce4a 100644 --- a/ext/skeleton/php_skeleton.h +++ b/ext/skeleton/php_skeleton.h @@ -32,9 +32,9 @@ ZEND_END_MODULE_GLOBALS(extname) /* In every utility function you add that needs to use variables in php_extname_globals, call TSRMLS_FETCH(); after declaring other - variables used by that function, or better yet, pass in TSRMLS_CC + variables used by that function, or better yet, pass in after the last function argument and declare your utility function - with TSRMLS_DC after the last declared argument. Always refer to + with after the last declared argument. Always refer to the globals in your function as EXTNAME_G(variable). You are encouraged to rename these macros something shorter, see examples in any other php module directory. diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 8e67e8af90..2d8a1d62bd 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -247,8 +247,8 @@ static void spl_filesystem_dir_open(spl_filesystem_object* intern, char *path) intern->u.dir.entry.d_name[0] = '\0'; if (!EG(exception)) { /* open failed w/out notice (turned to exception due to EH_THROW) */ - zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0 - TSRMLS_CC, "Failed to open directory \"%s\"", path); + zend_throw_exception_ex(spl_ce_UnexpectedValueException, 0, + "Failed to open directory \"%s\"", path); } } else { do { diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 917a022079..bbad6bc7d7 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -4879,8 +4879,7 @@ static int user_shutdown_function_call(zval *zv) /* {{{ */ &shutdown_function_entry->arguments[0], &retval, shutdown_function_entry->arg_count - 1, - shutdown_function_entry->arguments + 1 - TSRMLS_CC ) == SUCCESS) + shutdown_function_entry->arguments + 1) == SUCCESS) { zval_dtor(&retval); } @@ -4902,7 +4901,7 @@ static void user_tick_function_call(user_tick_function_entry *tick_fe) /* {{{ */ &retval, tick_fe->arg_count - 1, tick_fe->arguments + 1 - TSRMLS_CC) == SUCCESS) { + ) == SUCCESS) { zval_dtor(&retval); } else { diff --git a/ext/standard/filters.c b/ext/standard/filters.c index 1a74abf89c..912d2b1394 100644 --- a/ext/standard/filters.c +++ b/ext/standard/filters.c @@ -40,7 +40,7 @@ static php_stream_filter_status_t strfilter_rot13_filter( php_stream_bucket_brigade *buckets_out, size_t *bytes_consumed, int flags - TSRMLS_DC) + ) { php_stream_bucket *bucket; size_t consumed = 0; @@ -88,7 +88,7 @@ static php_stream_filter_status_t strfilter_toupper_filter( php_stream_bucket_brigade *buckets_out, size_t *bytes_consumed, int flags - TSRMLS_DC) + ) { php_stream_bucket *bucket; size_t consumed = 0; @@ -116,7 +116,7 @@ static php_stream_filter_status_t strfilter_tolower_filter( php_stream_bucket_brigade *buckets_out, size_t *bytes_consumed, int flags - TSRMLS_DC) + ) { php_stream_bucket *bucket; size_t consumed = 0; @@ -207,7 +207,7 @@ static php_stream_filter_status_t strfilter_strip_tags_filter( php_stream_bucket_brigade *buckets_out, size_t *bytes_consumed, int flags - TSRMLS_DC) + ) { php_stream_bucket *bucket; size_t consumed = 0; @@ -1726,7 +1726,7 @@ static php_stream_filter_status_t strfilter_convert_filter( php_stream_bucket_brigade *buckets_out, size_t *bytes_consumed, int flags - TSRMLS_DC) + ) { php_stream_bucket *bucket = NULL; size_t consumed = 0; @@ -1845,7 +1845,7 @@ static php_stream_filter_status_t consumed_filter_filter( php_stream_bucket_brigade *buckets_out, size_t *bytes_consumed, int flags - TSRMLS_DC) + ) { php_consumed_filter_data *data = (php_consumed_filter_data *)Z_PTR(thisfilter->abstract); php_stream_bucket *bucket; @@ -2058,7 +2058,7 @@ static php_stream_filter_status_t php_chunked_filter( php_stream_bucket_brigade *buckets_out, size_t *bytes_consumed, int flags - TSRMLS_DC) + ) { php_stream_bucket *bucket; size_t consumed = 0; @@ -2144,7 +2144,7 @@ PHP_MINIT_FUNCTION(standard_filters) if (FAILURE == php_stream_filter_register_factory( standard_filters[i].ops->label, standard_filters[i].factory - TSRMLS_CC)) { + )) { return FAILURE; } } diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c index 31ab31cf3f..3a28a2d576 100644 --- a/ext/standard/streamsfuncs.c +++ b/ext/standard/streamsfuncs.c @@ -272,7 +272,7 @@ PHP_FUNCTION(stream_socket_accept) zpeername ? &peername : NULL, NULL, NULL, &tv, &errstr - TSRMLS_CC) && clistream) { + ) && clistream) { if (peername) { ZVAL_STR(zpeername, peername); @@ -307,7 +307,7 @@ PHP_FUNCTION(stream_socket_get_name) if (0 != php_stream_xport_get_name(stream, want_peer, &name, NULL, NULL - TSRMLS_CC)) { + )) { RETURN_FALSE; } @@ -376,7 +376,7 @@ PHP_FUNCTION(stream_socket_recvfrom) recvd = php_stream_xport_recvfrom(stream, read_buf->val, to_read, (int)flags, NULL, NULL, zremote ? &remote_addr : NULL - TSRMLS_CC); + ); if (recvd >= 0) { if (zremote) { diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c index 292d0a9315..a24fb1ee8b 100644 --- a/ext/standard/url_scanner_ex.c +++ b/ext/standard/url_scanner_ex.c @@ -252,8 +252,8 @@ enum { #define YYMARKER q #define STATE ctx->state -#define STD_PARA url_adapt_state_ex_t *ctx, char *start, char *YYCURSOR TSRMLS_DC -#define STD_ARGS ctx, start, xp TSRMLS_CC +#define STD_PARA url_adapt_state_ex_t *ctx, char *start, char *YYCURSOR +#define STD_ARGS ctx, start, xp #if SCANNER_DEBUG #define scdebug(x) printf x diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re index 97611954f2..e374b76195 100644 --- a/ext/standard/url_scanner_ex.re +++ b/ext/standard/url_scanner_ex.re @@ -188,8 +188,8 @@ enum { #define YYMARKER q #define STATE ctx->state -#define STD_PARA url_adapt_state_ex_t *ctx, char *start, char *YYCURSOR TSRMLS_DC -#define STD_ARGS ctx, start, xp TSRMLS_CC +#define STD_PARA url_adapt_state_ex_t *ctx, char *start, char *YYCURSOR +#define STD_ARGS ctx, start, xp #if SCANNER_DEBUG #define scdebug(x) printf x diff --git a/ext/standard/user_filters.c b/ext/standard/user_filters.c index 9f748623c4..225381ffd5 100644 --- a/ext/standard/user_filters.c +++ b/ext/standard/user_filters.c @@ -169,7 +169,7 @@ php_stream_filter_status_t userfilter_filter( php_stream_bucket_brigade *buckets_out, size_t *bytes_consumed, int flags - TSRMLS_DC) + ) { int ret = PSFS_ERR_FATAL; zval *obj = &thisfilter->abstract; diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index f51a42095e..74a86ca5a7 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -319,8 +319,8 @@ static inline size_t parse_uiv(const unsigned char *p) return result; } -#define UNSERIALIZE_PARAMETER zval *rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash, HashTable *classes TSRMLS_DC -#define UNSERIALIZE_PASSTHRU rval, p, max, var_hash, classes TSRMLS_CC +#define UNSERIALIZE_PARAMETER zval *rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash, HashTable *classes +#define UNSERIALIZE_PASSTHRU rval, p, max, var_hash, classes static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, zend_long elements, int objprops) { diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 99600995a5..dc72d7051b 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -323,8 +323,8 @@ static inline size_t parse_uiv(const unsigned char *p) return result; } -#define UNSERIALIZE_PARAMETER zval *rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash, HashTable *classes TSRMLS_DC -#define UNSERIALIZE_PASSTHRU rval, p, max, var_hash, classes TSRMLS_CC +#define UNSERIALIZE_PARAMETER zval *rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash, HashTable *classes +#define UNSERIALIZE_PASSTHRU rval, p, max, var_hash, classes static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, zend_long elements, int objprops) { diff --git a/ext/xsl/php_xsl.h b/ext/xsl/php_xsl.h index c1fce674fd..eb6b2330c7 100644 --- a/ext/xsl/php_xsl.h +++ b/ext/xsl/php_xsl.h @@ -114,9 +114,9 @@ ZEND_END_MODULE_GLOBALS(xsl) /* In every utility function you add that needs to use variables in php_xsl_globals, call TSRM_FETCH(); after declaring other - variables used by that function, or better yet, pass in TSRMLS_CC + variables used by that function, or better yet, pass in after the last function argument and declare your utility function - with TSRMLS_DC after the last declared argument. Always refer to + with after the last declared argument. Always refer to the globals in your function as XSL_G(variable). You are encouraged to rename these macros something shorter, see examples in any other php module directory. diff --git a/ext/zlib/zlib_filter.c b/ext/zlib/zlib_filter.c index f17a8d6ce0..6f7a872788 100644 --- a/ext/zlib/zlib_filter.c +++ b/ext/zlib/zlib_filter.c @@ -58,7 +58,7 @@ static php_stream_filter_status_t php_zlib_inflate_filter( php_stream_bucket_brigade *buckets_out, size_t *bytes_consumed, int flags - TSRMLS_DC) + ) { php_zlib_filter_data *data; php_stream_bucket *bucket; @@ -181,7 +181,7 @@ static php_stream_filter_status_t php_zlib_deflate_filter( php_stream_bucket_brigade *buckets_out, size_t *bytes_consumed, int flags - TSRMLS_DC) + ) { php_zlib_filter_data *data; php_stream_bucket *bucket; diff --git a/main/internal_functions.c.in b/main/internal_functions.c.in index 3f02921ddf..d04eea3103 100644 --- a/main/internal_functions.c.in +++ b/main/internal_functions.c.in @@ -35,9 +35,9 @@ static zend_module_entry *php_builtin_extensions[] = { #define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *)) -PHPAPI int php_register_internal_extensions(TSRMLS_D) +PHPAPI int php_register_internal_extensions(void) { - return php_register_extensions(php_builtin_extensions, EXTCOUNT TSRMLS_CC); + return php_register_extensions(php_builtin_extensions, EXTCOUNT); } /* diff --git a/main/network.c b/main/network.c index 233122a0d3..ac80f53f93 100644 --- a/main/network.c +++ b/main/network.c @@ -417,7 +417,7 @@ static inline void sub_times(struct timeval a, struct timeval b, struct timeval /* {{{ php_network_bind_socket_to_local_addr */ php_socket_t php_network_bind_socket_to_local_addr(const char *host, unsigned port, int socktype, long sockopts, zend_string **error_string, int *error_code - TSRMLS_DC) + ) { int num_addrs, n, err = 0; php_socket_t sock; @@ -602,7 +602,7 @@ PHPAPI void php_network_populate_name_from_sockaddr( /* output address */ struct sockaddr **addr, socklen_t *addrlen - TSRMLS_DC) + ) { if (addr) { *addr = emalloc(sl); @@ -663,7 +663,7 @@ PHPAPI int php_network_get_peer_name(php_socket_t sock, zend_string **textaddr, struct sockaddr **addr, socklen_t *addrlen - TSRMLS_DC) + ) { php_sockaddr_storage sa; socklen_t sl = sizeof(sa); @@ -673,7 +673,7 @@ PHPAPI int php_network_get_peer_name(php_socket_t sock, php_network_populate_name_from_sockaddr((struct sockaddr*)&sa, sl, textaddr, addr, addrlen - TSRMLS_CC); + ); return 0; } return -1; @@ -683,7 +683,7 @@ PHPAPI int php_network_get_sock_name(php_socket_t sock, zend_string **textaddr, struct sockaddr **addr, socklen_t *addrlen - TSRMLS_DC) + ) { php_sockaddr_storage sa; socklen_t sl = sizeof(sa); @@ -693,7 +693,7 @@ PHPAPI int php_network_get_sock_name(php_socket_t sock, php_network_populate_name_from_sockaddr((struct sockaddr*)&sa, sl, textaddr, addr, addrlen - TSRMLS_CC); + ); return 0; } return -1; @@ -717,7 +717,7 @@ PHPAPI php_socket_t php_network_accept_incoming(php_socket_t srvsock, struct timeval *timeout, zend_string **error_string, int *error_code - TSRMLS_DC) + ) { php_socket_t clisock = -1; int error = 0, n; @@ -739,7 +739,7 @@ PHPAPI php_socket_t php_network_accept_incoming(php_socket_t srvsock, php_network_populate_name_from_sockaddr((struct sockaddr*)&sa, sl, textaddr, addr, addrlen - TSRMLS_CC); + ); } else { error = php_socket_errno(); } @@ -768,7 +768,7 @@ PHPAPI php_socket_t php_network_accept_incoming(php_socket_t srvsock, php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short port, int socktype, int asynchronous, struct timeval *timeout, zend_string **error_string, int *error_code, char *bindto, unsigned short bindport, long sockopts - TSRMLS_DC) + ) { int num_addrs, n, fatal = 0; php_socket_t sock; diff --git a/main/php_network.h b/main/php_network.h index 7529eb71e0..5a168cb0f9 100644 --- a/main/php_network.h +++ b/main/php_network.h @@ -236,7 +236,7 @@ PHPAPI void php_network_freeaddresses(struct sockaddr **sal); PHPAPI php_socket_t php_network_connect_socket_to_host(const char *host, unsigned short port, int socktype, int asynchronous, struct timeval *timeout, zend_string **error_string, int *error_code, char *bindto, unsigned short bindport, long sockopts - TSRMLS_DC); + ); PHPAPI int php_network_connect_socket(php_socket_t sockfd, const struct sockaddr *addr, @@ -251,7 +251,7 @@ PHPAPI int php_network_connect_socket(php_socket_t sockfd, PHPAPI php_socket_t php_network_bind_socket_to_local_addr(const char *host, unsigned port, int socktype, long sockopts, zend_string **error_string, int *error_code - TSRMLS_DC); + ); PHPAPI php_socket_t php_network_accept_incoming(php_socket_t srvsock, zend_string **textaddr, @@ -260,19 +260,19 @@ PHPAPI php_socket_t php_network_accept_incoming(php_socket_t srvsock, struct timeval *timeout, zend_string **error_string, int *error_code - TSRMLS_DC); + ); PHPAPI int php_network_get_sock_name(php_socket_t sock, zend_string **textaddr, struct sockaddr **addr, socklen_t *addrlen - TSRMLS_DC); + ); PHPAPI int php_network_get_peer_name(php_socket_t sock, zend_string **textaddr, struct sockaddr **addr, socklen_t *addrlen - TSRMLS_DC); + ); PHPAPI void php_any_addr(int family, php_sockaddr_storage *addr, unsigned short port); PHPAPI int php_sockaddr_size(php_sockaddr_storage *addr); @@ -303,7 +303,7 @@ PHPAPI void php_network_populate_name_from_sockaddr( /* output address */ struct sockaddr **addr, socklen_t *addrlen - TSRMLS_DC); + ); PHPAPI int php_network_parse_network_address_with_port(const char *addr, zend_long addrlen, struct sockaddr *sa, socklen_t *sl); diff --git a/main/php_streams.h b/main/php_streams.h index fe51f5e184..c0f16b6126 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -301,7 +301,7 @@ PHPAPI size_t _php_stream_printf(php_stream *stream, const char *fmt, ...) PHP_A PHPAPI size_t _php_stream_printf(php_stream *stream, const char *fmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 2, 3); #endif -/* php_stream_printf macro & function require TSRMLS_CC */ +/* php_stream_printf macro & function require */ #define php_stream_printf _php_stream_printf PHPAPI int _php_stream_eof(php_stream *stream); diff --git a/main/streams/php_stream_filter_api.h b/main/streams/php_stream_filter_api.h index feeb96aba0..7c9248ecc1 100644 --- a/main/streams/php_stream_filter_api.h +++ b/main/streams/php_stream_filter_api.h @@ -90,7 +90,7 @@ typedef struct _php_stream_filter_ops { php_stream_bucket_brigade *buckets_out, size_t *bytes_consumed, int flags - TSRMLS_DC); + ); void (*dtor)(php_stream_filter *thisfilter); diff --git a/main/streams/php_stream_transport.h b/main/streams/php_stream_transport.h index 89a2e9a5f3..7f587282f0 100644 --- a/main/streams/php_stream_transport.h +++ b/main/streams/php_stream_transport.h @@ -61,7 +61,7 @@ PHPAPI php_stream *_php_stream_xport_create(const char *name, size_t namelen, in PHPAPI int php_stream_xport_bind(php_stream *stream, const char *name, size_t namelen, zend_string **error_text - TSRMLS_DC); + ); /* Connect to a remote address */ PHPAPI int php_stream_xport_connect(php_stream *stream, @@ -70,13 +70,13 @@ PHPAPI int php_stream_xport_connect(php_stream *stream, struct timeval *timeout, zend_string **error_text, int *error_code - TSRMLS_DC); + ); /* Prepare to listen */ PHPAPI int php_stream_xport_listen(php_stream *stream, int backlog, zend_string **error_text - TSRMLS_DC); + ); /* Get the next client and their address as a string, or the underlying address * structure. You must efree either of these if you request them */ @@ -85,13 +85,13 @@ PHPAPI int php_stream_xport_accept(php_stream *stream, php_stream **client, void **addr, socklen_t *addrlen, struct timeval *timeout, zend_string **error_text - TSRMLS_DC); + ); /* Get the name of either the socket or it's peer */ PHPAPI int php_stream_xport_get_name(php_stream *stream, int want_peer, zend_string **textaddr, void **addr, socklen_t *addrlen - TSRMLS_DC); + ); enum php_stream_xport_send_recv_flags { STREAM_OOB = 1, diff --git a/main/streams/streams.c b/main/streams/streams.c index b5340e693a..fab5d42eb3 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -695,7 +695,7 @@ static void php_stream_fill_read_buffer(php_stream *stream, size_t size) justread = stream->ops->read(stream, (char*)stream->readbuf + stream->writepos, stream->readbuflen - stream->writepos - TSRMLS_CC); + ); if (justread != (size_t)-1) { stream->writepos += justread; diff --git a/main/streams/transports.c b/main/streams/transports.c index c0657ed0b4..6c68f839be 100644 --- a/main/streams/transports.c +++ b/main/streams/transports.c @@ -196,7 +196,7 @@ PHPAPI php_stream *_php_stream_xport_create(const char *name, size_t namelen, in PHPAPI int php_stream_xport_bind(php_stream *stream, const char *name, size_t namelen, zend_string **error_text - TSRMLS_DC) + ) { php_stream_xport_param param; int ret; @@ -227,7 +227,7 @@ PHPAPI int php_stream_xport_connect(php_stream *stream, struct timeval *timeout, zend_string **error_text, int *error_code - TSRMLS_DC) + ) { php_stream_xport_param param; int ret; @@ -286,7 +286,7 @@ PHPAPI int php_stream_xport_accept(php_stream *stream, php_stream **client, void **addr, socklen_t *addrlen, struct timeval *timeout, zend_string **error_text - TSRMLS_DC) + ) { php_stream_xport_param param; int ret; @@ -322,7 +322,7 @@ PHPAPI int php_stream_xport_accept(php_stream *stream, php_stream **client, PHPAPI int php_stream_xport_get_name(php_stream *stream, int want_peer, zend_string **textaddr, void **addr, socklen_t *addrlen - TSRMLS_DC) + ) { php_stream_xport_param param; int ret; @@ -394,7 +394,7 @@ PHPAPI int php_stream_xport_crypto_enable(php_stream *stream, int activate) * peeking, optionally retrieving OOB data */ PHPAPI int php_stream_xport_recvfrom(php_stream *stream, char *buf, size_t buflen, int flags, void **addr, socklen_t *addrlen, zend_string **textaddr - TSRMLS_DC) + ) { php_stream_xport_param param; int ret = 0; diff --git a/main/streams/userspace.c b/main/streams/userspace.c index 1215851374..c3f167636e 100644 --- a/main/streams/userspace.c +++ b/main/streams/userspace.c @@ -377,7 +377,7 @@ static php_stream *user_wrapper_opener(php_stream_wrapper *wrapper, const char * &zfuncname, &zretval, 4, args, - 0, NULL TSRMLS_CC); + 0, NULL ); if (call_result == SUCCESS && Z_TYPE(zretval) != IS_UNDEF && zval_is_true(&zretval)) { /* the stream is now open! */ @@ -452,7 +452,7 @@ static php_stream *user_wrapper_opendir(php_stream_wrapper *wrapper, const char &zfuncname, &zretval, 2, args, - 0, NULL TSRMLS_CC); + 0, NULL ); if (call_result == SUCCESS && Z_TYPE(zretval) != IS_UNDEF && zval_is_true(&zretval)) { /* the stream is now open! */ @@ -1107,7 +1107,7 @@ static int user_wrapper_unlink(php_stream_wrapper *wrapper, const char *url, int &zfuncname, &zretval, 1, args, - 0, NULL TSRMLS_CC); + 0, NULL ); if (call_result == SUCCESS && (Z_TYPE(zretval) == IS_FALSE || Z_TYPE(zretval) == IS_TRUE)) { ret = (Z_TYPE(zretval) == IS_TRUE); @@ -1152,7 +1152,7 @@ static int user_wrapper_rename(php_stream_wrapper *wrapper, const char *url_from &zfuncname, &zretval, 2, args, - 0, NULL TSRMLS_CC); + 0, NULL ); if (call_result == SUCCESS && (Z_TYPE(zretval) == IS_FALSE || Z_TYPE(zretval) == IS_TRUE)) { ret = (Z_TYPE(zretval) == IS_TRUE); @@ -1199,7 +1199,7 @@ static int user_wrapper_mkdir(php_stream_wrapper *wrapper, const char *url, int &zfuncname, &zretval, 3, args, - 0, NULL TSRMLS_CC); + 0, NULL ); if (call_result == SUCCESS && (Z_TYPE(zretval) == IS_FALSE || Z_TYPE(zretval) == IS_TRUE)) { ret = (Z_TYPE(zretval) == IS_TRUE); @@ -1246,7 +1246,7 @@ static int user_wrapper_rmdir(php_stream_wrapper *wrapper, const char *url, &zfuncname, &zretval, 2, args, - 0, NULL TSRMLS_CC); + 0, NULL ); if (call_result == SUCCESS && (Z_TYPE(zretval) == IS_FALSE || Z_TYPE(zretval) == IS_TRUE)) { ret = (Z_TYPE(zretval) == IS_TRUE); @@ -1317,7 +1317,7 @@ static int user_wrapper_metadata(php_stream_wrapper *wrapper, const char *url, i &zfuncname, &zretval, 3, args, - 0, NULL TSRMLS_CC); + 0, NULL ); if (call_result == SUCCESS && (Z_TYPE(zretval) == IS_FALSE || Z_TYPE(zretval) == IS_TRUE)) { ret = Z_TYPE(zretval) == IS_TRUE; @@ -1365,7 +1365,7 @@ static int user_wrapper_stat_url(php_stream_wrapper *wrapper, const char *url, i &zfuncname, &zretval, 2, args, - 0, NULL TSRMLS_CC); + 0, NULL ); if (call_result == SUCCESS && Z_TYPE(zretval) == IS_ARRAY) { /* We got the info we needed */ diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index 983f403c9d..9fa2ae367e 100644 --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@ -244,7 +244,7 @@ static int php_sockop_stat(php_stream *stream, php_stream_statbuf *ssb) static inline int sock_sendto(php_netstream_data_t *sock, const char *buf, size_t buflen, int flags, struct sockaddr *addr, socklen_t addrlen - TSRMLS_DC) + ) { int ret; if (addr) { @@ -262,7 +262,7 @@ static inline int sock_sendto(php_netstream_data_t *sock, const char *buf, size_ static inline int sock_recvfrom(php_netstream_data_t *sock, char *buf, size_t buflen, int flags, zend_string **textaddr, struct sockaddr **addr, socklen_t *addrlen - TSRMLS_DC) + ) { php_sockaddr_storage sa; socklen_t sl = sizeof(sa); @@ -353,7 +353,7 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void xparam->want_textaddr ? &xparam->outputs.textaddr : NULL, xparam->want_addr ? &xparam->outputs.addr : NULL, xparam->want_addr ? &xparam->outputs.addrlen : NULL - TSRMLS_CC); + ); return PHP_STREAM_OPTION_RETURN_OK; case STREAM_XPORT_OP_GET_PEER_NAME: @@ -361,7 +361,7 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void xparam->want_textaddr ? &xparam->outputs.textaddr : NULL, xparam->want_addr ? &xparam->outputs.addr : NULL, xparam->want_addr ? &xparam->outputs.addrlen : NULL - TSRMLS_CC); + ); return PHP_STREAM_OPTION_RETURN_OK; case STREAM_XPORT_OP_SEND: @@ -396,7 +396,7 @@ static int php_sockop_set_option(php_stream *stream, int option, int value, void xparam->want_textaddr ? &xparam->outputs.textaddr : NULL, xparam->want_addr ? &xparam->outputs.addr : NULL, xparam->want_addr ? &xparam->outputs.addrlen : NULL - TSRMLS_CC); + ); return PHP_STREAM_OPTION_RETURN_OK; @@ -647,7 +647,7 @@ static inline int php_tcp_sockop_bind(php_stream *stream, php_netstream_data_t * sockopts, xparam->want_errortext ? &xparam->outputs.error_text : NULL, &err - TSRMLS_CC); + ); if (host) { efree(host); @@ -733,7 +733,7 @@ static inline int php_tcp_sockop_connect(php_stream *stream, php_netstream_data_ bindto, bindport, sockopts - TSRMLS_CC); + ); ret = sock->socket == -1 ? -1 : 0; xparam->outputs.error_code = err; @@ -771,7 +771,7 @@ static inline int php_tcp_sockop_accept(php_stream *stream, php_netstream_data_t xparam->inputs.timeout, xparam->want_errortext ? &xparam->outputs.error_text : NULL, &xparam->outputs.error_code - TSRMLS_CC); + ); if (clisock >= 0) { php_netstream_data_t *clisockdata; diff --git a/sapi/phpdbg/phpdbg_cmd.h b/sapi/phpdbg/phpdbg_cmd.h index 9589c3644b..41b0c671d1 100644 --- a/sapi/phpdbg/phpdbg_cmd.h +++ b/sapi/phpdbg/phpdbg_cmd.h @@ -169,7 +169,7 @@ PHPDBG_API void phpdbg_param_debug(const phpdbg_param_t *param, const char *msg) #define PHPDBG_COMMAND(name) int phpdbg_do_##name(const phpdbg_param_t *param) -#define PHPDBG_COMMAND_ARGS param TSRMLS_CC +#define PHPDBG_COMMAND_ARGS param #define PHPDBG_END_COMMAND {NULL, 0, NULL, 0, '\0', NULL, NULL, NULL, NULL, 0} diff --git a/sapi/phpdbg/phpdbg_help.c b/sapi/phpdbg/phpdbg_help.c index 4fad1cff96..fefde149e3 100644 --- a/sapi/phpdbg/phpdbg_help.c +++ b/sapi/phpdbg/phpdbg_help.c @@ -180,7 +180,7 @@ static int get_command( const char *key, size_t len, /* pointer and length of key */ phpdbg_command_t const **command, /* address of first matching command */ phpdbg_command_t const * commands /* command table to be scanned */ - TSRMLS_DC) + ) { const phpdbg_command_t *c; unsigned int num_matches = 0; diff --git a/sapi/phpdbg/phpdbg_lexer.c b/sapi/phpdbg/phpdbg_lexer.c index 54f4fc7e72..76dfc393b8 100644 --- a/sapi/phpdbg/phpdbg_lexer.c +++ b/sapi/phpdbg/phpdbg_lexer.c @@ -39,7 +39,6 @@ void phpdbg_init_lexer (phpdbg_param_t *stack, char *input) { } int phpdbg_lex (phpdbg_param_t* yylval) { - TSRMLS_FETCH(); /* Slow, but this is not a major problem here. TODO: Use TSRMLS_DC */ restart: LEX(text) = YYCURSOR; diff --git a/sapi/phpdbg/phpdbg_lexer.l b/sapi/phpdbg/phpdbg_lexer.l index de0f9f1999..45d7c27fa5 100644 --- a/sapi/phpdbg/phpdbg_lexer.l +++ b/sapi/phpdbg/phpdbg_lexer.l @@ -37,7 +37,6 @@ void phpdbg_init_lexer (phpdbg_param_t *stack, char *input) { } int phpdbg_lex (phpdbg_param_t* yylval) { - TSRMLS_FETCH(); /* Slow, but this is not a major problem here. TODO: Use TSRMLS_DC */ restart: LEX(text) = YYCURSOR; diff --git a/sapi/phpdbg/phpdbg_watch.c b/sapi/phpdbg/phpdbg_watch.c index 8caa71caad..adb01f6d54 100644 --- a/sapi/phpdbg/phpdbg_watch.c +++ b/sapi/phpdbg/phpdbg_watch.c @@ -525,7 +525,7 @@ int phpdbg_watchpoint_segfault_handler(siginfo_t *info, void *context) { #else info->si_addr #endif - TSRMLS_CC); + ); if (watch == NULL) { return FAILURE; diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c index db9b1c5306..3d2e24b3d6 100644 --- a/sapi/thttpd/thttpd.c +++ b/sapi/thttpd/thttpd.c @@ -354,7 +354,7 @@ static int php_thttpd_startup(sapi_module_struct *sapi_module) #if PHP_API_VERSION >= 20020918 if (php_module_startup(sapi_module, &php_thttpd_module, 1) == FAILURE) { #else - /* No TSRMLS_CC here to zend_startup_module() as 5.6 and older does not have that parameter */ + /* No here to zend_startup_module() as 5.6 and older does not have that parameter */ if (php_module_startup(sapi_module) == FAILURE || zend_startup_module(&php_thttpd_module) == FAILURE) { #endif |