From: Zeev Suraski Date: Sun, 5 Oct 2003 08:08:49 +0000 (+0000) Subject: Sync with new API X-Git-Tag: RELEASE_1_3b3~129 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6c240a455555864c8a70591c0a8bde0b8c0405b;p=php Sync with new API --- diff --git a/ext/com_dotnet/com_handlers.c b/ext/com_dotnet/com_handlers.c index 0e8337c1ec..0b759ecc0e 100644 --- a/ext/com_dotnet/com_handlers.c +++ b/ext/com_dotnet/com_handlers.c @@ -204,15 +204,6 @@ static void com_write_dimension(zval *object, zval *offset, zval *value TSRMLS_D } } -static zval **com_property_get_ptr(zval *object, zval *member TSRMLS_DC) -{ - zval **prop_ptr; - - prop_ptr = emalloc(sizeof(zval **)); - *prop_ptr = com_property_read(object, member, 0 TSRMLS_CC); - return prop_ptr; -} - static void com_object_set(zval **property, zval *value TSRMLS_DC) { /* Not yet implemented in the engine */ @@ -512,8 +503,7 @@ zend_object_handlers php_com_object_handlers = { com_property_write, com_read_dimension, com_write_dimension, - com_property_get_ptr, - com_property_get_ptr, + NULL, com_object_get, com_object_set, com_property_exists, diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index a6bb8e4659..833e7359a9 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -441,7 +441,6 @@ PHP_MINIT_FUNCTION(dom) memcpy(&dom_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); dom_object_handlers.read_property = dom_read_property; dom_object_handlers.write_property = dom_write_property; - dom_object_handlers.get_property_ptr = dom_property_get_ptr; zend_hash_init(&classes, 0, NULL, NULL, 1); diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index eab901911c..a1821feaa5 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -264,41 +264,6 @@ next_iter: } /* }}} */ -/* {{{ sxe_property_get_ptr() - */ -static zval ** -sxe_property_get_ptr(zval *object, zval *member TSRMLS_DC) -{ -#if 0 - zval **property_ptr; - zval *property; - - property_ptr = emalloc(sizeof(zval **)); - - property = sxe_property_read(object, member, 0 TSRMLS_CC); - - *property_ptr = property; - - return property_ptr; -#else - /* necessary voodoo hack */ - struct compounded_zval_ptr { - zval zv; - zval *pzv; - }; - - zval *property; - - property = sxe_property_read(object, member, 0 TSRMLS_CC); - property = erealloc(property, sizeof(struct compounded_zval_ptr)); - - ((struct compounded_zval_ptr *)property)->pzv = property; - - return &((struct compounded_zval_ptr *)property)->pzv; -#endif -} -/* }}} */ - /* {{{ sxe_property_exists() */ static int @@ -830,8 +795,7 @@ static zend_object_handlers sxe_object_handlers = { sxe_property_write, NULL, NULL, - sxe_property_get_ptr, - sxe_property_get_ptr, + NULL, sxe_object_get, sxe_object_set, sxe_property_exists,