cvs: php4 /ext/rpc/com com.c conversion.c conversion.h dispatch.c variant.c /main main.c ZendEngine2 zend.c zend_API.c zend_API.h
zend_builtin_functions.c zend_compile.h zend_execute.c zend_execute_API.c zend_opcode.c zend_operators.h
| From: | Sebastian Bergmann | Date: | Wed, 26 Mar 2003 07:44:10 +0000 |
| Subject: | cvs: php4 /ext/rpc/com com.c conversion.c conversion.h dispatch.c variant.c /main main.c ZendEngine2 zend.c zend_API.c zend_API.h zend_builtin_functions.c zend_compile.h zend_execute.c zend_execute_API.c zend_opcode.c zend_operators.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-19787@lists.php.net to get a copy of this message | ||
sebastian Wed Mar 26 02:44:10 2003 EDT
Modified files:
/ZendEngine2 zend.c zend_API.c zend_API.h zend_builtin_functions.c
zend_compile.h zend_execute.c zend_execute_API.c
zend_opcode.c zend_operators.h
/php4/ext/rpc/com com.c conversion.c conversion.h dispatch.c
variant.c
/php4/main main.c
Log:
Eliminate TSRMLS_FETCH() calls in destroy_op_array() and zend_get_class_entry().
Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.217 ZendEngine2/zend.c:1.218 --- ZendEngine2/zend.c:1.217 Sun Mar 23 16:27:22 2003 +++ ZendEngine2/zend.c Wed Mar 26 02:44:09 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.217 2003/03/23 21:27:22 andi Exp $ */ +/* $Id: zend.c,v 1.218 2003/03/26 07:44:09 sebastian Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -1028,7 +1028,7 @@ zval_ptr_dtor(EG(return_value_ptr_ptr)); local_retval = NULL; } - destroy_op_array(EG(active_op_array)); + destroy_op_array(EG(active_op_array) TSRMLS_CC); efree(EG(active_op_array)); } else if (type==ZEND_REQUIRE) { va_end(files); Index: ZendEngine2/zend_API.c diff -u ZendEngine2/zend_API.c:1.160 ZendEngine2/zend_API.c:1.161 --- ZendEngine2/zend_API.c:1.160 Wed Mar 26 01:32:53 2003 +++ ZendEngine2/zend_API.c Wed Mar 26 02:44:09 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.c,v 1.160 2003/03/26 06:32:53 sebastian Exp $ */ +/* $Id: zend_API.c,v 1.161 2003/03/26 07:44:09 sebastian Exp $ */ #include "zend.h" #include "zend_execute.h" @@ -199,10 +199,9 @@ } } -ZEND_API zend_class_entry *zend_get_class_entry(zval *zobject) +ZEND_API zend_class_entry *zend_get_class_entry(zval *zobject TSRMLS_DC) { if (Z_OBJ_HT_P(zobject)->get_class_entry) { - TSRMLS_FETCH(); return Z_OBJ_HT_P(zobject)->get_class_entry(zobject TSRMLS_CC); } else { zend_error(E_ERROR, "Class entry requested for an object without PHP class"); @@ -210,7 +209,7 @@ } } -static int zend_check_class(zval *obj, zend_class_entry *expected_ce) +static int zend_check_class(zval *obj, zend_class_entry *expected_ce TSRMLS_DC) { zend_class_entry *ce; @@ -227,7 +226,7 @@ return 0; } -static char *zend_parse_arg_impl(zval **arg, va_list *va, char **spec) +static char *zend_parse_arg_impl(zval **arg, va_list *va, char **spec TSRMLS_DC) { char *spec_walk = *spec; char c = *spec_walk++; @@ -410,7 +409,7 @@ { zval **p = va_arg(*va, zval **); zend_class_entry *ce = va_arg(*va, zend_class_entry *); - if (!zend_check_class(*arg, ce)) { + if (!zend_check_class(*arg, ce TSRMLS_CC)) { if (Z_TYPE_PP(arg) == IS_NULL && return_null) { *p = NULL; } else { @@ -445,7 +444,7 @@ { char *expected_type = NULL; - expected_type = zend_parse_arg_impl(arg, va, spec); + expected_type = zend_parse_arg_impl(arg, va, spec TSRMLS_CC); if (expected_type) { if (!quiet) { zend_error(E_WARNING, "%s() expects parameter %d to be %s, %s given", @@ -610,7 +609,7 @@ return FAILURE; } else { - if (!zend_check_class(*parameter, ce)) { + if (!zend_check_class(*parameter, ce TSRMLS_CC)) { if (!quiet) { zend_error(E_WARNING, "%s() expects parameter 1 to be %s, %s given", get_active_function_name(TSRMLS_C), ce->name, Index: ZendEngine2/zend_API.h diff -u ZendEngine2/zend_API.h:1.131 ZendEngine2/zend_API.h:1.132 --- ZendEngine2/zend_API.h:1.131 Sun Mar 2 20:22:43 2003 +++ ZendEngine2/zend_API.h Wed Mar 26 02:44:09 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.h,v 1.131 2003/03/03 01:22:43 phanto Exp $ */ +/* $Id: zend_API.h,v 1.132 2003/03/26 07:44:09 sebastian Exp $ */ #ifndef ZEND_API_H #define ZEND_API_H @@ -142,7 +142,7 @@ ZEND_API zend_bool zend_is_callable(zval *callable, zend_bool syntax_only, char **callable_name); ZEND_API char *zend_get_module_version(char *module_name); -ZEND_API zend_class_entry *zend_get_class_entry(zval *zobject); +ZEND_API zend_class_entry *zend_get_class_entry(zval *zobject TSRMLS_DC); #define getThis() (this_ptr) Index: ZendEngine2/zend_builtin_functions.c diff -u ZendEngine2/zend_builtin_functions.c:1.175 ZendEngine2/zend_builtin_functions.c:1.176 --- ZendEngine2/zend_builtin_functions.c:1.175 Wed Mar 5 06:14:41 2003 +++ ZendEngine2/zend_builtin_functions.c Wed Mar 26 02:44:09 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_builtin_functions.c,v 1.175 2003/03/05 11:14:41 zeev Exp $ */ +/* $Id: zend_builtin_functions.c,v 1.176 2003/03/26 07:44:09 sebastian Exp $ */ #include "zend.h" #include "zend_API.h" @@ -530,7 +530,7 @@ Z_OBJ_HT_PP(arg)->get_class_name(*arg, &name, &name_len, 0 TSRMLS_CC) != SUCCESS) { zend_class_entry *ce; - ce = zend_get_class_entry(*arg); + ce = zend_get_class_entry(*arg TSRMLS_CC); if (!ce) { RETURN_FALSE; } @@ -562,7 +562,7 @@ if (Z_OBJ_HT_PP(arg)->get_class_name && Z_OBJ_HT_PP(arg)->get_class_name(*arg, &name, &name_length, 1 TSRMLS_CC) == SUCCESS) { RETURN_STRINGL(name, name_length, 1); - } else if (Z_OBJ_HT_PP(arg)->get_class_entry && (ce = zend_get_class_entry(*arg))) { + } else if (Z_OBJ_HT_PP(arg)->get_class_entry && (ce = zend_get_class_entry(*arg TSRMLS_CC))) { RETURN_STRINGL(ce->name, ce->name_length, 1); } else { RETURN_FALSE; Index: ZendEngine2/zend_compile.h diff -u ZendEngine2/zend_compile.h:1.226 ZendEngine2/zend_compile.h:1.227 --- ZendEngine2/zend_compile.h:1.226 Sat Mar 22 18:26:00 2003 +++ ZendEngine2/zend_compile.h Wed Mar 26 02:44:09 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.h,v 1.226 2003/03/22 23:26:00 shane Exp $ */ +/* $Id: zend_compile.h,v 1.227 2003/03/26 07:44:09 sebastian Exp $ */ #ifndef ZEND_COMPILE_H #define ZEND_COMPILE_H @@ -433,13 +433,13 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_count, ...); ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC); ZEND_API void init_op_array(zend_op_array *op_array, zend_uchar type, int initial_ops_size TSRMLS_DC); -ZEND_API void destroy_op_array(zend_op_array *op_array); +ZEND_API void destroy_op_array(zend_op_array *op_array TSRMLS_DC); ZEND_API void zend_destroy_file_handle(zend_file_handle *file_handle TSRMLS_DC); ZEND_API void zend_file_handle_dtor(zend_file_handle *fh); ZEND_API int zend_cleanup_class_data(zend_class_entry **pce TSRMLS_DC); ZEND_API int zend_cleanup_function_data(zend_function *function TSRMLS_DC); -ZEND_API void destroy_zend_function(zend_function *function); +ZEND_API void destroy_zend_function(zend_function *function TSRMLS_DC); ZEND_API void destroy_zend_class(zend_class_entry **pce); void zend_class_add_ref(zend_class_entry **ce); Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.446 ZendEngine2/zend_execute.c:1.447 --- ZendEngine2/zend_execute.c:1.446 Mon Mar 24 06:54:42 2003 +++ ZendEngine2/zend_execute.c Wed Mar 26 02:44:09 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.446 2003/03/24 11:54:42 stas Exp $ */ +/* $Id: zend_execute.c,v 1.447 2003/03/26 07:44:09 sebastian Exp $ */ #define ZEND_INTENSIVE_DEBUGGING 0 @@ -3456,7 +3456,7 @@ EG(opline_ptr) = &EX(opline); EG(active_op_array) = op_array; EG(function_state_ptr) = &EX(function_state); - destroy_op_array(new_op_array); + destroy_op_array(new_op_array TSRMLS_CC); efree(new_op_array); } else { if (return_value_used) { Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.198 ZendEngine2/zend_execute_API.c:1.199 --- ZendEngine2/zend_execute_API.c:1.198 Sun Mar 2 10:24:04 2003 +++ ZendEngine2/zend_execute_API.c Wed Mar 26 02:44:09 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute_API.c,v 1.198 2003/03/02 15:24:04 zeev Exp $ */ +/* $Id: zend_execute_API.c,v 1.199 2003/03/26 07:44:09 sebastian Exp $ */ #include <stdio.h> #include <signal.h> @@ -820,7 +820,7 @@ EG(opline_ptr) = original_opline_ptr; EG(active_op_array) = original_active_op_array; EG(function_state_ptr) = original_function_state_ptr; - destroy_op_array(new_op_array); + destroy_op_array(new_op_array TSRMLS_CC); efree(new_op_array); EG(return_value_ptr_ptr) = original_return_value_ptr_ptr; retval = SUCCESS; Index: ZendEngine2/zend_opcode.c diff -u ZendEngine2/zend_opcode.c:1.85 ZendEngine2/zend_opcode.c:1.86 --- ZendEngine2/zend_opcode.c:1.85 Wed Mar 5 06:14:43 2003 +++ ZendEngine2/zend_opcode.c Wed Mar 26 02:44:09 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_opcode.c,v 1.85 2003/03/05 11:14:43 zeev Exp $ */ +/* $Id: zend_opcode.c,v 1.86 2003/03/26 07:44:09 sebastian Exp $ */ #include <stdio.h> @@ -97,11 +97,11 @@ } -ZEND_API void destroy_zend_function(zend_function *function) +ZEND_API void destroy_zend_function(zend_function *function TSRMLS_DC) { switch (function->type) { case ZEND_USER_FUNCTION: - destroy_op_array((zend_op_array *) function); + destroy_op_array((zend_op_array *) function TSRMLS_CC); break; case ZEND_INTERNAL_FUNCTION: /* do nothing */ @@ -194,11 +194,10 @@ } -ZEND_API void destroy_op_array(zend_op_array *op_array) +ZEND_API void destroy_op_array(zend_op_array *op_array TSRMLS_DC) { zend_op *opline = op_array->opcodes; zend_op *end = op_array->opcodes+op_array->last; - TSRMLS_FETCH(); if (op_array->static_variables) { zend_hash_destroy(op_array->static_variables); Index: ZendEngine2/zend_operators.h diff -u ZendEngine2/zend_operators.h:1.70 ZendEngine2/zend_operators.h:1.71 --- ZendEngine2/zend_operators.h:1.70 Wed Mar 5 06:14:44 2003 +++ ZendEngine2/zend_operators.h Wed Mar 26 02:44:09 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_operators.h,v 1.70 2003/03/05 11:14:44 zeev Exp $ */ +/* $Id: zend_operators.h,v 1.71 2003/03/26 07:44:09 sebastian Exp $ */ #ifndef ZEND_OPERATORS_H #define ZEND_OPERATORS_H @@ -239,7 +239,7 @@ #define Z_ARRVAL(zval) (zval).value.ht #define Z_OBJ_HANDLE(zval) (zval).value.obj.handle #define Z_OBJ_HT(zval) (zval).value.obj.handlers -#define Z_OBJCE(zval) zend_get_class_entry(&(zval)) +#define Z_OBJCE(zval) zend_get_class_entry(&(zval) TSRMLS_CC) #define Z_OBJPROP(zval) Z_OBJ_HT((zval))->get_properties(&(zval) TSRMLS_CC) #define Z_OBJ_HANDLER(zval, hf) Z_OBJ_HT((zval))->hf #define Z_RESVAL(zval) (zval).value.lval Index: php4/ext/rpc/com/com.c diff -u php4/ext/rpc/com/com.c:1.25 php4/ext/rpc/com/com.c:1.26 --- php4/ext/rpc/com/com.c:1.25 Tue Feb 18 14:03:43 2003 +++ php4/ext/rpc/com/com.c Wed Mar 26 02:44:09 2003 @@ -676,6 +676,7 @@ VARIANT result; int current_arg, current_variant; char *ErrString = NULL; + TSRMLS_FETCH(); /* if the length of the name is 0, we are dealing with a pointer to a dispid */ assert(method_name.len == 0); @@ -684,7 +685,7 @@ for (current_arg = 0; current_arg < num_args; current_arg++) { current_variant = num_args - current_arg - 1; - php_zval_to_variant(*args[current_arg], &variant_args[current_variant], C_CODEPAGE((comval *) data)); + php_zval_to_variant(*args[current_arg], &variant_args[current_variant], C_CODEPAGE((comval *) data) TSRMLS_CC); } dispparams.rgvarg = variant_args; @@ -777,11 +778,12 @@ DISPPARAMS dispparams; VARIANT *var; char *error_message, *ErrString = NULL; + TSRMLS_FETCH(); var = (VARIANT *) emalloc(sizeof(VARIANT)); VariantInit(var); - php_zval_to_variant(value, var, C_CODEPAGE((comval *) data)); + php_zval_to_variant(value, var, C_CODEPAGE((comval *) data) TSRMLS_CC); dispparams.rgvarg = var; dispparams.rgdispidNamedArgs = &mydispid; dispparams.cArgs = 1; @@ -897,7 +899,7 @@ for (current_arg = 2; current_arg < arg_count; current_arg++) { current_variant = arg_count - current_arg - 1; php_zval_to_variant(arguments[current_arg], &variant_args[current_variant], - C_CODEPAGE((comval *)intern->data)); + C_CODEPAGE((comval *)intern->data) TSRMLS_CC); } dispparams.rgvarg = variant_args; Index: php4/ext/rpc/com/conversion.c diff -u php4/ext/rpc/com/conversion.c:1.56 php4/ext/rpc/com/conversion.c:1.57 --- php4/ext/rpc/com/conversion.c:1.56 Mon Feb 17 08:29:57 2003 +++ php4/ext/rpc/com/conversion.c Wed Mar 26 02:44:09 2003 @@ -48,7 +48,7 @@ static int comval_to_variant(zval *zval_arg, VARIANT *var_arg); /* implementations */ -PHPAPI void php_zval_to_variant(zval *zval_arg, VARIANT *var_arg, int codepage) +PHPAPI void php_zval_to_variant(zval *zval_arg, VARIANT *var_arg, int codepage TSRMLS_DC) { int type = VT_EMPTY; /* default variant type */ @@ -92,11 +92,11 @@ break; } - php_zval_to_variant_ex(zval_arg, var_arg, type, codepage); + php_zval_to_variant_ex(zval_arg, var_arg, type, codepage TSRMLS_CC); } -PHPAPI void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, int codepage) +PHPAPI void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC) { OLECHAR *unicode_str = NULL; @@ -140,9 +140,9 @@ /* Add another value to the safe array */ if (SUCCEEDED(SafeArrayPtrOfIndex( safeArray, &i, &v))) { /* Pointer to output element entry retrieved successfully */ if (type) { /* explicit type */ - php_zval_to_variant_ex(*entry, v, type, codepage); /* Do the required conversion */ + php_zval_to_variant_ex(*entry, v, type, codepage TSRMLS_CC); /* Do the required conversion */ } else { - php_zval_to_variant(*entry, v, codepage); /* Do the required conversion */ + php_zval_to_variant(*entry, v, codepage TSRMLS_CC); /* Do the required conversion */ } } else { rpc_error(E_WARNING, "phpArrayToSafeArray() - Unable to retrieve pointer to output element number (%d)", i); Index: php4/ext/rpc/com/conversion.h diff -u php4/ext/rpc/com/conversion.h:1.10 php4/ext/rpc/com/conversion.h:1.11 --- php4/ext/rpc/com/conversion.h:1.10 Tue Dec 31 11:07:23 2002 +++ php4/ext/rpc/com/conversion.h Wed Mar 26 02:44:10 2003 @@ -30,8 +30,8 @@ BEGIN_EXTERN_C() -ZEND_API void php_zval_to_variant(zval *zval_arg, VARIANT *var_arg, int codepage); -ZEND_API void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, int codepage); +ZEND_API void php_zval_to_variant(zval *zval_arg, VARIANT *var_arg, int codepage TSRMLS_DC); +ZEND_API void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC); ZEND_API int php_variant_to_zval(VARIANT *var_arg, zval *zval_arg, int codepage); ZEND_API OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage, int persist); Index: php4/ext/rpc/com/dispatch.c diff -u php4/ext/rpc/com/dispatch.c:1.6 php4/ext/rpc/com/dispatch.c:1.7 --- php4/ext/rpc/com/dispatch.c:1.6 Mon Feb 17 08:29:57 2003 +++ php4/ext/rpc/com/dispatch.c Wed Mar 26 02:44:10 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dispatch.c,v 1.6 2003/02/17 13:29:57 zeev Exp $ */ +/* $Id: dispatch.c,v 1.7 2003/03/26 07:44:10 sebastian Exp $ */ /* * This module is used to export PHP objects to COM and DOTNET by exposing @@ -103,6 +103,7 @@ /* [in] */ REFIID riid, /* [iid_is][out] */ void **ppvObject) { + TSRMLS_FETCH(); FETCH_DISP("QueryInterface"); if (IsEqualGUID(&IID_IUnknown, riid) || @@ -120,6 +121,7 @@ static ULONG STDMETHODCALLTYPE disp_addref(IDispatchEx *This) { + TSRMLS_FETCH(); FETCH_DISP("AddRef"); return InterlockedIncrement(&disp->refcount); @@ -145,6 +147,7 @@ IDispatchEx *This, /* [out] */ UINT *pctinfo) { + TSRMLS_FETCH(); FETCH_DISP("GetTypeInfoCount"); *pctinfo = 0; @@ -157,6 +160,7 @@ /* [in] */ LCID lcid, /* [out] */ ITypeInfo **ppTInfo) { + TSRMLS_FETCH(); FETCH_DISP("GetTypeInfo"); *ppTInfo = NULL; @@ -328,7 +332,7 @@ V_VT(pvarRes) = VT_DISPATCH; V_DISPATCH(pvarRes) = php_COM_export_object(retval); } else { - php_zval_to_variant(retval, pvarRes, codepage); + php_zval_to_variant(retval, pvarRes, codepage TSRMLS_CC); } } zval_ptr_dtor(&retval); @@ -348,6 +352,7 @@ /* [in] */ BSTR bstrName, /* [in] */ DWORD grfdex) { + TSRMLS_FETCH(); FETCH_DISP("DeleteMemberByName"); return S_FALSE; @@ -357,6 +362,7 @@ IDispatchEx *This, /* [in] */ DISPID id) { + TSRMLS_FETCH(); FETCH_DISP("DeleteMemberByDispID"); return S_FALSE; @@ -368,6 +374,7 @@ /* [in] */ DWORD grfdexFetch, /* [out] */ DWORD *pgrfdex) { + TSRMLS_FETCH(); FETCH_DISP("GetMemberProperties"); return DISP_E_UNKNOWNNAME; @@ -399,6 +406,7 @@ /* [out] */ DISPID *pid) { ulong next = id+1; + TSRMLS_FETCH(); FETCH_DISP("GetNextDispID"); while(!zend_hash_index_exists(disp->dispid_to_name, next)) @@ -415,6 +423,7 @@ IDispatchEx *This, /* [out] */ IUnknown **ppunk) { + TSRMLS_FETCH(); FETCH_DISP("GetNameSpaceParent"); *ppunk = NULL; Index: php4/ext/rpc/com/variant.c diff -u php4/ext/rpc/com/variant.c:1.40 php4/ext/rpc/com/variant.c:1.41 --- php4/ext/rpc/com/variant.c:1.40 Mon Feb 17 08:29:57 2003 +++ php4/ext/rpc/com/variant.c Wed Mar 26 02:44:10 2003 @@ -280,9 +280,9 @@ } if (!strcmp(Z_STRVAL_P(member), "value")) { - php_zval_to_variant(value, var->var, var->codepage); + php_zval_to_variant(value, var->var, var->codepage TSRMLS_CC); } else if (zend_hash_find(&types, Z_STRVAL_P(member), Z_STRLEN_P(member) + 1, (void **) &type) == SUCCESS) { - php_zval_to_variant_ex(value, var->var, *type, var->codepage); + php_zval_to_variant_ex(value, var->var, *type, var->codepage TSRMLS_CC); } else { rpc_error(E_WARNING, "Unknown member."); } @@ -314,9 +314,9 @@ if (value) { if (type) { - php_zval_to_variant_ex(value, var->var, type, var->codepage); + php_zval_to_variant_ex(value, var->var, type, var->codepage TSRMLS_CC); } else { - php_zval_to_variant(value, var->var, var->codepage); + php_zval_to_variant(value, var->var, var->codepage TSRMLS_CC); } } } Index: php4/main/main.c diff -u php4/main/main.c:1.543 php4/main/main.c:1.544 --- php4/main/main.c:1.543 Wed Mar 19 03:22:12 2003 +++ php4/main/main.c Wed Mar 26 02:44:10 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.543 2003/03/19 08:22:12 sniper Exp $ */ +/* $Id: main.c,v 1.544 2003/03/26 07:44:10 sebastian Exp $ */ /* {{{ includes */ @@ -1697,7 +1697,7 @@ zend_destroy_file_handle(file TSRMLS_CC); if (op_array) { - destroy_op_array(op_array); + destroy_op_array(op_array TSRMLS_CC); efree(op_array); return SUCCESS; } else {
Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.217 ZendEngine2/zend.c:1.218 --- ZendEngine2/zend.c:1.217 Sun Mar 23 16:27:22 2003 +++ ZendEngine2/zend.c Wed Mar 26 02:44:09 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.217 2003/03/23 21:27:22 andi Exp $ */ +/* $Id: zend.c,v 1.218 2003/03/26 07:44:09 sebastian Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -1028,7 +1028,7 @@ zval_ptr_dtor(EG(return_value_ptr_ptr)); local_retval = NULL; } - destroy_op_array(EG(active_op_array)); + destroy_op_array(EG(active_op_array) TSRMLS_CC); efree(EG(active_op_array)); } else if (type==ZEND_REQUIRE) { va_end(files); Index: ZendEngine2/zend_API.c diff -u ZendEngine2/zend_API.c:1.160 ZendEngine2/zend_API.c:1.161 --- ZendEngine2/zend_API.c:1.160 Wed Mar 26 01:32:53 2003 +++ ZendEngine2/zend_API.c Wed Mar 26 02:44:09 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.c,v 1.160 2003/03/26 06:32:53 sebastian Exp $ */ +/* $Id: zend_API.c,v 1.161 2003/03/26 07:44:09 sebastian Exp $ */ #include "zend.h" #include "zend_execute.h" @@ -199,10 +199,9 @@ } } -ZEND_API zend_class_entry *zend_get_class_entry(zval *zobject) +ZEND_API zend_class_entry *zend_get_class_entry(zval *zobject TSRMLS_DC) { if (Z_OBJ_HT_P(zobject)->get_class_entry) { - TSRMLS_FETCH(); return Z_OBJ_HT_P(zobject)->get_class_entry(zobject TSRMLS_CC); } else { zend_error(E_ERROR, "Class entry requested for an object without PHP class"); @@ -210,7 +209,7 @@ } } -static int zend_check_class(zval *obj, zend_class_entry *expected_ce) +static int zend_check_class(zval *obj, zend_class_entry *expected_ce TSRMLS_DC) { zend_class_entry *ce; @@ -227,7 +226,7 @@ return 0; } -static char *zend_parse_arg_impl(zval **arg, va_list *va, char **spec) +static char *zend_parse_arg_impl(zval **arg, va_list *va, char **spec TSRMLS_DC) { char *spec_walk = *spec; char c = *spec_walk++; @@ -410,7 +409,7 @@ { zval **p = va_arg(*va, zval **); zend_class_entry *ce = va_arg(*va, zend_class_entry *); - if (!zend_check_class(*arg, ce)) { + if (!zend_check_class(*arg, ce TSRMLS_CC)) { if (Z_TYPE_PP(arg) == IS_NULL && return_null) { *p = NULL; } else { @@ -445,7 +444,7 @@ { char *expected_type = NULL; - expected_type = zend_parse_arg_impl(arg, va, spec); + expected_type = zend_parse_arg_impl(arg, va, spec TSRMLS_CC); if (expected_type) { if (!quiet) { zend_error(E_WARNING, "%s() expects parameter %d to be %s, %s given", @@ -610,7 +609,7 @@ return FAILURE; } else { - if (!zend_check_class(*parameter, ce)) { + if (!zend_check_class(*parameter, ce TSRMLS_CC)) { if (!quiet) { zend_error(E_WARNING, "%s() expects parameter 1 to be %s, %s given", get_active_function_name(TSRMLS_C), ce->name, Index: ZendEngine2/zend_API.h diff -u ZendEngine2/zend_API.h:1.131 ZendEngine2/zend_API.h:1.132 --- ZendEngine2/zend_API.h:1.131 Sun Mar 2 20:22:43 2003 +++ ZendEngine2/zend_API.h Wed Mar 26 02:44:09 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.h,v 1.131 2003/03/03 01:22:43 phanto Exp $ */ +/* $Id: zend_API.h,v 1.132 2003/03/26 07:44:09 sebastian Exp $ */ #ifndef ZEND_API_H #define ZEND_API_H @@ -142,7 +142,7 @@ ZEND_API zend_bool zend_is_callable(zval *callable, zend_bool syntax_only, char **callable_name); ZEND_API char *zend_get_module_version(char *module_name); -ZEND_API zend_class_entry *zend_get_class_entry(zval *zobject); +ZEND_API zend_class_entry *zend_get_class_entry(zval *zobject TSRMLS_DC); #define getThis() (this_ptr) Index: ZendEngine2/zend_builtin_functions.c diff -u ZendEngine2/zend_builtin_functions.c:1.175 ZendEngine2/zend_builtin_functions.c:1.176 --- ZendEngine2/zend_builtin_functions.c:1.175 Wed Mar 5 06:14:41 2003 +++ ZendEngine2/zend_builtin_functions.c Wed Mar 26 02:44:09 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_builtin_functions.c,v 1.175 2003/03/05 11:14:41 zeev Exp $ */ +/* $Id: zend_builtin_functions.c,v 1.176 2003/03/26 07:44:09 sebastian Exp $ */ #include "zend.h" #include "zend_API.h" @@ -530,7 +530,7 @@ Z_OBJ_HT_PP(arg)->get_class_name(*arg, &name, &name_len, 0 TSRMLS_CC) != SUCCESS) { zend_class_entry *ce; - ce = zend_get_class_entry(*arg); + ce = zend_get_class_entry(*arg TSRMLS_CC); if (!ce) { RETURN_FALSE; } @@ -562,7 +562,7 @@ if (Z_OBJ_HT_PP(arg)->get_class_name && Z_OBJ_HT_PP(arg)->get_class_name(*arg, &name, &name_length, 1 TSRMLS_CC) == SUCCESS) { RETURN_STRINGL(name, name_length, 1); - } else if (Z_OBJ_HT_PP(arg)->get_class_entry && (ce = zend_get_class_entry(*arg))) { + } else if (Z_OBJ_HT_PP(arg)->get_class_entry && (ce = zend_get_class_entry(*arg TSRMLS_CC))) { RETURN_STRINGL(ce->name, ce->name_length, 1); } else { RETURN_FALSE; Index: ZendEngine2/zend_compile.h diff -u ZendEngine2/zend_compile.h:1.226 ZendEngine2/zend_compile.h:1.227 --- ZendEngine2/zend_compile.h:1.226 Sat Mar 22 18:26:00 2003 +++ ZendEngine2/zend_compile.h Wed Mar 26 02:44:09 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.h,v 1.226 2003/03/22 23:26:00 shane Exp $ */ +/* $Id: zend_compile.h,v 1.227 2003/03/26 07:44:09 sebastian Exp $ */ #ifndef ZEND_COMPILE_H #define ZEND_COMPILE_H @@ -433,13 +433,13 @@ ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_count, ...); ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC); ZEND_API void init_op_array(zend_op_array *op_array, zend_uchar type, int initial_ops_size TSRMLS_DC); -ZEND_API void destroy_op_array(zend_op_array *op_array); +ZEND_API void destroy_op_array(zend_op_array *op_array TSRMLS_DC); ZEND_API void zend_destroy_file_handle(zend_file_handle *file_handle TSRMLS_DC); ZEND_API void zend_file_handle_dtor(zend_file_handle *fh); ZEND_API int zend_cleanup_class_data(zend_class_entry **pce TSRMLS_DC); ZEND_API int zend_cleanup_function_data(zend_function *function TSRMLS_DC); -ZEND_API void destroy_zend_function(zend_function *function); +ZEND_API void destroy_zend_function(zend_function *function TSRMLS_DC); ZEND_API void destroy_zend_class(zend_class_entry **pce); void zend_class_add_ref(zend_class_entry **ce); Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.446 ZendEngine2/zend_execute.c:1.447 --- ZendEngine2/zend_execute.c:1.446 Mon Mar 24 06:54:42 2003 +++ ZendEngine2/zend_execute.c Wed Mar 26 02:44:09 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.446 2003/03/24 11:54:42 stas Exp $ */ +/* $Id: zend_execute.c,v 1.447 2003/03/26 07:44:09 sebastian Exp $ */ #define ZEND_INTENSIVE_DEBUGGING 0 @@ -3456,7 +3456,7 @@ EG(opline_ptr) = &EX(opline); EG(active_op_array) = op_array; EG(function_state_ptr) = &EX(function_state); - destroy_op_array(new_op_array); + destroy_op_array(new_op_array TSRMLS_CC); efree(new_op_array); } else { if (return_value_used) { Index: ZendEngine2/zend_execute_API.c diff -u ZendEngine2/zend_execute_API.c:1.198 ZendEngine2/zend_execute_API.c:1.199 --- ZendEngine2/zend_execute_API.c:1.198 Sun Mar 2 10:24:04 2003 +++ ZendEngine2/zend_execute_API.c Wed Mar 26 02:44:09 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute_API.c,v 1.198 2003/03/02 15:24:04 zeev Exp $ */ +/* $Id: zend_execute_API.c,v 1.199 2003/03/26 07:44:09 sebastian Exp $ */ #include <stdio.h> #include <signal.h> @@ -820,7 +820,7 @@ EG(opline_ptr) = original_opline_ptr; EG(active_op_array) = original_active_op_array; EG(function_state_ptr) = original_function_state_ptr; - destroy_op_array(new_op_array); + destroy_op_array(new_op_array TSRMLS_CC); efree(new_op_array); EG(return_value_ptr_ptr) = original_return_value_ptr_ptr; retval = SUCCESS; Index: ZendEngine2/zend_opcode.c diff -u ZendEngine2/zend_opcode.c:1.85 ZendEngine2/zend_opcode.c:1.86 --- ZendEngine2/zend_opcode.c:1.85 Wed Mar 5 06:14:43 2003 +++ ZendEngine2/zend_opcode.c Wed Mar 26 02:44:09 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_opcode.c,v 1.85 2003/03/05 11:14:43 zeev Exp $ */ +/* $Id: zend_opcode.c,v 1.86 2003/03/26 07:44:09 sebastian Exp $ */ #include <stdio.h> @@ -97,11 +97,11 @@ } -ZEND_API void destroy_zend_function(zend_function *function) +ZEND_API void destroy_zend_function(zend_function *function TSRMLS_DC) { switch (function->type) { case ZEND_USER_FUNCTION: - destroy_op_array((zend_op_array *) function); + destroy_op_array((zend_op_array *) function TSRMLS_CC); break; case ZEND_INTERNAL_FUNCTION: /* do nothing */ @@ -194,11 +194,10 @@ } -ZEND_API void destroy_op_array(zend_op_array *op_array) +ZEND_API void destroy_op_array(zend_op_array *op_array TSRMLS_DC) { zend_op *opline = op_array->opcodes; zend_op *end = op_array->opcodes+op_array->last; - TSRMLS_FETCH(); if (op_array->static_variables) { zend_hash_destroy(op_array->static_variables); Index: ZendEngine2/zend_operators.h diff -u ZendEngine2/zend_operators.h:1.70 ZendEngine2/zend_operators.h:1.71 --- ZendEngine2/zend_operators.h:1.70 Wed Mar 5 06:14:44 2003 +++ ZendEngine2/zend_operators.h Wed Mar 26 02:44:09 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_operators.h,v 1.70 2003/03/05 11:14:44 zeev Exp $ */ +/* $Id: zend_operators.h,v 1.71 2003/03/26 07:44:09 sebastian Exp $ */ #ifndef ZEND_OPERATORS_H #define ZEND_OPERATORS_H @@ -239,7 +239,7 @@ #define Z_ARRVAL(zval) (zval).value.ht #define Z_OBJ_HANDLE(zval) (zval).value.obj.handle #define Z_OBJ_HT(zval) (zval).value.obj.handlers -#define Z_OBJCE(zval) zend_get_class_entry(&(zval)) +#define Z_OBJCE(zval) zend_get_class_entry(&(zval) TSRMLS_CC) #define Z_OBJPROP(zval) Z_OBJ_HT((zval))->get_properties(&(zval) TSRMLS_CC) #define Z_OBJ_HANDLER(zval, hf) Z_OBJ_HT((zval))->hf #define Z_RESVAL(zval) (zval).value.lval Index: php4/ext/rpc/com/com.c diff -u php4/ext/rpc/com/com.c:1.25 php4/ext/rpc/com/com.c:1.26 --- php4/ext/rpc/com/com.c:1.25 Tue Feb 18 14:03:43 2003 +++ php4/ext/rpc/com/com.c Wed Mar 26 02:44:09 2003 @@ -676,6 +676,7 @@ VARIANT result; int current_arg, current_variant; char *ErrString = NULL; + TSRMLS_FETCH(); /* if the length of the name is 0, we are dealing with a pointer to a dispid */ assert(method_name.len == 0); @@ -684,7 +685,7 @@ for (current_arg = 0; current_arg < num_args; current_arg++) { current_variant = num_args - current_arg - 1; - php_zval_to_variant(*args[current_arg], &variant_args[current_variant], C_CODEPAGE((comval *) data)); + php_zval_to_variant(*args[current_arg], &variant_args[current_variant], C_CODEPAGE((comval *) data) TSRMLS_CC); } dispparams.rgvarg = variant_args; @@ -777,11 +778,12 @@ DISPPARAMS dispparams; VARIANT *var; char *error_message, *ErrString = NULL; + TSRMLS_FETCH(); var = (VARIANT *) emalloc(sizeof(VARIANT)); VariantInit(var); - php_zval_to_variant(value, var, C_CODEPAGE((comval *) data)); + php_zval_to_variant(value, var, C_CODEPAGE((comval *) data) TSRMLS_CC); dispparams.rgvarg = var; dispparams.rgdispidNamedArgs = &mydispid; dispparams.cArgs = 1; @@ -897,7 +899,7 @@ for (current_arg = 2; current_arg < arg_count; current_arg++) { current_variant = arg_count - current_arg - 1; php_zval_to_variant(arguments[current_arg], &variant_args[current_variant], - C_CODEPAGE((comval *)intern->data)); + C_CODEPAGE((comval *)intern->data) TSRMLS_CC); } dispparams.rgvarg = variant_args; Index: php4/ext/rpc/com/conversion.c diff -u php4/ext/rpc/com/conversion.c:1.56 php4/ext/rpc/com/conversion.c:1.57 --- php4/ext/rpc/com/conversion.c:1.56 Mon Feb 17 08:29:57 2003 +++ php4/ext/rpc/com/conversion.c Wed Mar 26 02:44:09 2003 @@ -48,7 +48,7 @@ static int comval_to_variant(zval *zval_arg, VARIANT *var_arg); /* implementations */ -PHPAPI void php_zval_to_variant(zval *zval_arg, VARIANT *var_arg, int codepage) +PHPAPI void php_zval_to_variant(zval *zval_arg, VARIANT *var_arg, int codepage TSRMLS_DC) { int type = VT_EMPTY; /* default variant type */ @@ -92,11 +92,11 @@ break; } - php_zval_to_variant_ex(zval_arg, var_arg, type, codepage); + php_zval_to_variant_ex(zval_arg, var_arg, type, codepage TSRMLS_CC); } -PHPAPI void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, int codepage) +PHPAPI void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC) { OLECHAR *unicode_str = NULL; @@ -140,9 +140,9 @@ /* Add another value to the safe array */ if (SUCCEEDED(SafeArrayPtrOfIndex( safeArray, &i, &v))) { /* Pointer to output element entry retrieved successfully */ if (type) { /* explicit type */ - php_zval_to_variant_ex(*entry, v, type, codepage); /* Do the required conversion */ + php_zval_to_variant_ex(*entry, v, type, codepage TSRMLS_CC); /* Do the required conversion */ } else { - php_zval_to_variant(*entry, v, codepage); /* Do the required conversion */ + php_zval_to_variant(*entry, v, codepage TSRMLS_CC); /* Do the required conversion */ } } else { rpc_error(E_WARNING, "phpArrayToSafeArray() - Unable to retrieve pointer to output element number (%d)", i); Index: php4/ext/rpc/com/conversion.h diff -u php4/ext/rpc/com/conversion.h:1.10 php4/ext/rpc/com/conversion.h:1.11 --- php4/ext/rpc/com/conversion.h:1.10 Tue Dec 31 11:07:23 2002 +++ php4/ext/rpc/com/conversion.h Wed Mar 26 02:44:10 2003 @@ -30,8 +30,8 @@ BEGIN_EXTERN_C() -ZEND_API void php_zval_to_variant(zval *zval_arg, VARIANT *var_arg, int codepage); -ZEND_API void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, int codepage); +ZEND_API void php_zval_to_variant(zval *zval_arg, VARIANT *var_arg, int codepage TSRMLS_DC); +ZEND_API void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC); ZEND_API int php_variant_to_zval(VARIANT *var_arg, zval *zval_arg, int codepage); ZEND_API OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage, int persist); Index: php4/ext/rpc/com/dispatch.c diff -u php4/ext/rpc/com/dispatch.c:1.6 php4/ext/rpc/com/dispatch.c:1.7 --- php4/ext/rpc/com/dispatch.c:1.6 Mon Feb 17 08:29:57 2003 +++ php4/ext/rpc/com/dispatch.c Wed Mar 26 02:44:10 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dispatch.c,v 1.6 2003/02/17 13:29:57 zeev Exp $ */ +/* $Id: dispatch.c,v 1.7 2003/03/26 07:44:10 sebastian Exp $ */ /* * This module is used to export PHP objects to COM and DOTNET by exposing @@ -103,6 +103,7 @@ /* [in] */ REFIID riid, /* [iid_is][out] */ void **ppvObject) { + TSRMLS_FETCH(); FETCH_DISP("QueryInterface"); if (IsEqualGUID(&IID_IUnknown, riid) || @@ -120,6 +121,7 @@ static ULONG STDMETHODCALLTYPE disp_addref(IDispatchEx *This) { + TSRMLS_FETCH(); FETCH_DISP("AddRef"); return InterlockedIncrement(&disp->refcount); @@ -145,6 +147,7 @@ IDispatchEx *This, /* [out] */ UINT *pctinfo) { + TSRMLS_FETCH(); FETCH_DISP("GetTypeInfoCount"); *pctinfo = 0; @@ -157,6 +160,7 @@ /* [in] */ LCID lcid, /* [out] */ ITypeInfo **ppTInfo) { + TSRMLS_FETCH(); FETCH_DISP("GetTypeInfo"); *ppTInfo = NULL; @@ -328,7 +332,7 @@ V_VT(pvarRes) = VT_DISPATCH; V_DISPATCH(pvarRes) = php_COM_export_object(retval); } else { - php_zval_to_variant(retval, pvarRes, codepage); + php_zval_to_variant(retval, pvarRes, codepage TSRMLS_CC); } } zval_ptr_dtor(&retval); @@ -348,6 +352,7 @@ /* [in] */ BSTR bstrName, /* [in] */ DWORD grfdex) { + TSRMLS_FETCH(); FETCH_DISP("DeleteMemberByName"); return S_FALSE; @@ -357,6 +362,7 @@ IDispatchEx *This, /* [in] */ DISPID id) { + TSRMLS_FETCH(); FETCH_DISP("DeleteMemberByDispID"); return S_FALSE; @@ -368,6 +374,7 @@ /* [in] */ DWORD grfdexFetch, /* [out] */ DWORD *pgrfdex) { + TSRMLS_FETCH(); FETCH_DISP("GetMemberProperties"); return DISP_E_UNKNOWNNAME; @@ -399,6 +406,7 @@ /* [out] */ DISPID *pid) { ulong next = id+1; + TSRMLS_FETCH(); FETCH_DISP("GetNextDispID"); while(!zend_hash_index_exists(disp->dispid_to_name, next)) @@ -415,6 +423,7 @@ IDispatchEx *This, /* [out] */ IUnknown **ppunk) { + TSRMLS_FETCH(); FETCH_DISP("GetNameSpaceParent"); *ppunk = NULL; Index: php4/ext/rpc/com/variant.c diff -u php4/ext/rpc/com/variant.c:1.40 php4/ext/rpc/com/variant.c:1.41 --- php4/ext/rpc/com/variant.c:1.40 Mon Feb 17 08:29:57 2003 +++ php4/ext/rpc/com/variant.c Wed Mar 26 02:44:10 2003 @@ -280,9 +280,9 @@ } if (!strcmp(Z_STRVAL_P(member), "value")) { - php_zval_to_variant(value, var->var, var->codepage); + php_zval_to_variant(value, var->var, var->codepage TSRMLS_CC); } else if (zend_hash_find(&types, Z_STRVAL_P(member), Z_STRLEN_P(member) + 1, (void **) &type) == SUCCESS) { - php_zval_to_variant_ex(value, var->var, *type, var->codepage); + php_zval_to_variant_ex(value, var->var, *type, var->codepage TSRMLS_CC); } else { rpc_error(E_WARNING, "Unknown member."); } @@ -314,9 +314,9 @@ if (value) { if (type) { - php_zval_to_variant_ex(value, var->var, type, var->codepage); + php_zval_to_variant_ex(value, var->var, type, var->codepage TSRMLS_CC); } else { - php_zval_to_variant(value, var->var, var->codepage); + php_zval_to_variant(value, var->var, var->codepage TSRMLS_CC); } } } Index: php4/main/main.c diff -u php4/main/main.c:1.543 php4/main/main.c:1.544 --- php4/main/main.c:1.543 Wed Mar 19 03:22:12 2003 +++ php4/main/main.c Wed Mar 26 02:44:10 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.543 2003/03/19 08:22:12 sniper Exp $ */ +/* $Id: main.c,v 1.544 2003/03/26 07:44:10 sebastian Exp $ */ /* {{{ includes */ @@ -1697,7 +1697,7 @@ zend_destroy_file_handle(file TSRMLS_CC); if (op_array) { - destroy_op_array(op_array); + destroy_op_array(op_array TSRMLS_CC); efree(op_array); return SUCCESS; } else {