zeev Sun Oct 5 04:08:50 2003 EDT Modified files: /php-src/ext/com_dotnet com_handlers.c /php-src/ext/dom php_dom.c /php-src/ext/mono php_mono.c /php-src/ext/simplexml simplexml.c /php-src/ext/standard math.c Log: Sync with new API Index: php-src/ext/com_dotnet/com_handlers.c diff -u php-src/ext/com_dotnet/com_handlers.c:1.2 php-src/ext/com_dotnet/com_handlers.c:1.3 --- php-src/ext/com_dotnet/com_handlers.c:1.2 Mon Aug 18 00:41:48 2003 +++ php-src/ext/com_dotnet/com_handlers.c Sun Oct 5 04:08:44 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: com_handlers.c,v 1.2 2003/08/18 04:41:48 iliaa Exp $ */ +/* $Id: com_handlers.c,v 1.3 2003/10/05 08:08:44 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -204,15 +204,6 @@ } } -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 @@ 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, Index: php-src/ext/dom/php_dom.c diff -u php-src/ext/dom/php_dom.c:1.33 php-src/ext/dom/php_dom.c:1.34 --- php-src/ext/dom/php_dom.c:1.33 Mon Sep 29 07:43:26 2003 +++ php-src/ext/dom/php_dom.c Sun Oct 5 04:08:46 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dom.c,v 1.33 2003/09/29 11:43:26 rrichards Exp $ */ +/* $Id: php_dom.c,v 1.34 2003/10/05 08:08:46 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -441,7 +441,6 @@ 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); Index: php-src/ext/mono/php_mono.c diff -u php-src/ext/mono/php_mono.c:1.8 php-src/ext/mono/php_mono.c:1.9 --- php-src/ext/mono/php_mono.c:1.8 Mon Aug 11 20:55:57 2003 +++ php-src/ext/mono/php_mono.c Sun Oct 5 04:08:47 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mono.c,v 1.8 2003/08/12 00:55:57 iliaa Exp $ */ +/* $Id: php_mono.c,v 1.9 2003/10/05 08:08:47 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -736,7 +736,6 @@ ZEND_OBJECTS_STORE_HANDLERS, property_read, property_write, - property_get_ptr, property_get_ptr, NULL, NULL, Index: php-src/ext/simplexml/simplexml.c diff -u php-src/ext/simplexml/simplexml.c:1.60 php-src/ext/simplexml/simplexml.c:1.61 --- php-src/ext/simplexml/simplexml.c:1.60 Thu Oct 2 15:45:05 2003 +++ php-src/ext/simplexml/simplexml.c Sun Oct 5 04:08:48 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: simplexml.c,v 1.60 2003/10/02 19:45:05 moriyoshi Exp $ */ +/* $Id: simplexml.c,v 1.61 2003/10/05 08:08:48 zeev Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -264,41 +264,6 @@ } /* }}} */ -/* {{{ 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 @@ sxe_property_write, NULL, NULL, - sxe_property_get_ptr, - sxe_property_get_ptr, + NULL, sxe_object_get, sxe_object_set, sxe_property_exists, @@ -1085,7 +1049,7 @@ { php_info_print_table_start(); php_info_print_table_header(2, "Simplexml support", "enabled"); - php_info_print_table_row(2, "Revision", "$Revision: 1.60 $"); + php_info_print_table_row(2, "Revision", "$Revision: 1.61 $"); php_info_print_table_end(); } /* }}} */ Index: php-src/ext/standard/math.c diff -u php-src/ext/standard/math.c:1.107 php-src/ext/standard/math.c:1.108 --- php-src/ext/standard/math.c:1.107 Thu Aug 28 12:49:57 2003 +++ php-src/ext/standard/math.c Sun Oct 5 04:08:49 2003 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: math.c,v 1.107 2003/08/28 16:49:57 sas Exp $ */ +/* $Id: math.c,v 1.108 2003/10/05 08:08:49 zeev Exp $ */ #include "php.h" #include "php_math.h" @@ -33,7 +33,7 @@ #endif #ifndef PHP_ROUND_FUZZ -# ifndef PHP_WIN32 +# ifndef PHP_WIN32 # define PHP_ROUND_FUZZ 0.50000000001 # else # define PHP_ROUND_FUZZ 0.5
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php