diff options
| author | Zeev Suraski <zeev@php.net> | 2004-11-25 20:28:37 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2004-11-25 20:28:37 +0000 |
| commit | 59b098a525a702651038df95473e98698232d53a (patch) | |
| tree | 9bef4300cde21edcb0fc227e44833afcaa2457f1 | |
| parent | a7cb6a88084970bd156aa45fde95e5676cdcfbac (diff) | |
| download | php-git-59b098a525a702651038df95473e98698232d53a.tar.gz | |
Reverting get_method() signature change
@ Guys - I did my best to look for all of the changed places,
@ but I may have missed something. If you remember other places
@ which were changed that I haven't reverted, please fix or let me know.
@ Also - Marcus, please take a look at SPL - as this particular
@ implementation took advantage of the signature change, the way I 'fixed'
@ it may very well be incorrect
| -rw-r--r-- | ext/com_dotnet/com_handlers.c | 3 | ||||
| -rwxr-xr-x | ext/spl/spl_iterators.c | 8 | ||||
| -rw-r--r-- | ext/standard/incomplete_class.c | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c index 63b4d3252e..cee0b41017 100644 --- a/ext/com_dotnet/com_handlers.c +++ b/ext/com_dotnet/com_handlers.c @@ -293,13 +293,12 @@ static PHP_FUNCTION(com_method_handler) INTERNAL_FUNCTION_PARAM_PASSTHRU); } -static union _zend_function *com_method_get(zval **object_ptr, char *name, int len TSRMLS_DC) +static union _zend_function *com_method_get(zval *object, char *name, int len TSRMLS_DC) { zend_internal_function f, *fptr = NULL; php_com_dotnet_object *obj; union _zend_function *func; DISPID dummy; - zval *object = *object_ptr; obj = CDNO_FETCH(object); diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index 43080004f1..d089dfaad8 100755 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -489,19 +489,19 @@ static int spl_dual_it_gets_implemented(zend_class_entry *interface, zend_class_ } #endif -static union _zend_function *spl_dual_it_get_method(zval **object_ptr, char *method, int method_len TSRMLS_DC) +static union _zend_function *spl_dual_it_get_method(zval *object_ptr, char *method, int method_len TSRMLS_DC) { union _zend_function *function_handler; spl_dual_it_object *intern; - intern = (spl_dual_it_object*)zend_object_store_get_object(*object_ptr TSRMLS_CC); + intern = (spl_dual_it_object*)zend_object_store_get_object(object_ptr TSRMLS_CC); function_handler = std_object_handlers.get_method(object_ptr, method, method_len TSRMLS_CC); if (!function_handler) { if (zend_hash_find(&intern->inner.ce->function_table, method, method_len+1, (void **) &function_handler) == FAILURE) { if (Z_OBJ_HT_P(intern->inner.zobject)->get_method) { - *object_ptr = intern->inner.zobject; - function_handler = Z_OBJ_HT_P(*object_ptr)->get_method(object_ptr, method, method_len TSRMLS_CC); + object_ptr = intern->inner.zobject; + function_handler = Z_OBJ_HT_P(object_ptr)->get_method(object_ptr, method, method_len TSRMLS_CC); } } } diff --git a/ext/standard/incomplete_class.c b/ext/standard/incomplete_class.c index 88e3f1ddd7..49b0ed69f5 100644 --- a/ext/standard/incomplete_class.c +++ b/ext/standard/incomplete_class.c @@ -82,8 +82,8 @@ static int incomplete_class_has_property(zval *object, zval *member, int check_e return 0; } -static union _zend_function *incomplete_class_get_method(zval **object_ptr, char *method, int method_len TSRMLS_DC) { - incomplete_class_message(*object_ptr, E_ERROR TSRMLS_CC); +static union _zend_function *incomplete_class_get_method(zval *object_ptr, char *method, int method_len TSRMLS_DC) { + incomplete_class_message(object_ptr, E_ERROR TSRMLS_CC); return NULL; } |