From 65a24337932aebff5c23eb6e35c0d654a7326d78 Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Sat, 30 Oct 2004 19:21:59 +0000 Subject: [PATCH] MFH --- ext/spl/spl_iterators.c | 11 ++++++----- ext/standard/incomplete_class.c | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c index aeec54bec6..1dcee7a72c 100755 --- a/ext/spl/spl_iterators.c +++ b/ext/spl/spl_iterators.c @@ -489,18 +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, 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 TSRMLS_CC); + intern = (spl_dual_it_object*)zend_object_store_get_object(*object_ptr TSRMLS_CC); - function_handler = std_object_handlers.get_method(object, method, method_len 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) { - function_handler = Z_OBJ_HT_P(intern->inner.zobject)->get_method(intern->inner.zobject, 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); } } } @@ -609,7 +610,7 @@ static INLINE spl_dual_it_object* spl_dual_it_construct(INTERNAL_FUNCTION_PARAME return intern; } -/* {{{ proto FilterIterator::__construct(Iterator $it) +/* {{{ proto FilterIterator::__construct(Iterator it) Create an Iterator from another iterator */ SPL_METHOD(dual_it, __construct) { diff --git a/ext/standard/incomplete_class.c b/ext/standard/incomplete_class.c index 7f45cd88f3..88e3f1ddd7 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, char *method, int method_len TSRMLS_DC) { - incomplete_class_message(object, 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; } -- 2.40.0