cvs: php-src(PHP_5_2) /ext/dom php_dom.c /ext/simplexml simplexml.c
| From: | Marcus Boerger | Date: | Wed, 10 May 2006 19:39:46 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/dom php_dom.c /ext/simplexml simplexml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-38138@lists.php.net to get a copy of this message | ||
helly Wed May 10 19:39:46 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/dom php_dom.c
/php-src/ext/simplexml simplexml.c
Log:
- ze1 cleanup (bjori) /thx
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/php_dom.c?r1=1.73.2.12.2.1&r2=1.73.2.12.2.2&diff_format=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.73.2.12.2.1 php-src/ext/dom/php_dom.c:1.73.2.12.2.2
--- php-src/ext/dom/php_dom.c:1.73.2.12.2.1 Tue May 9 23:55:24 2006
+++ php-src/ext/dom/php_dom.c Wed May 10 19:39:46 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.c,v 1.73.2.12.2.1 2006/05/09 23:55:24 helly Exp $ */
+/* $Id: php_dom.c,v 1.73.2.12.2.2 2006/05/10 19:39:46 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -69,7 +69,6 @@
zend_class_entry *dom_namespace_node_class_entry;
zend_object_handlers dom_object_handlers;
-zend_object_handlers dom_ze1_object_handlers;
static HashTable classes;
@@ -451,13 +450,6 @@
return retval;
}
-zend_object_value dom_objects_ze1_clone_obj(zval *zobject TSRMLS_DC)
-{
- php_error(E_ERROR, "Cannot clone object of class %s due to
'zend.ze1_compatibility_mode'", Z_OBJCE_P(zobject)->name);
- /* Return zobject->value.obj just to satisfy compiler */
- return zobject->value.obj;
-}
-
static zend_function_entry dom_functions[] = {
PHP_FE(dom_import_simplexml, NULL)
{NULL, NULL, NULL}
@@ -503,13 +495,6 @@
dom_object_handlers.clone_obj = dom_objects_store_clone_obj;
dom_object_handlers.has_property = dom_property_exists;
- memcpy(&dom_ze1_object_handlers, zend_get_std_object_handlers(),
sizeof(zend_object_handlers));
- dom_ze1_object_handlers.read_property = dom_read_property;
- dom_ze1_object_handlers.write_property = dom_write_property;
- dom_object_handlers.get_property_ptr_ptr = dom_get_property_ptr_ptr;
- dom_ze1_object_handlers.clone_obj = dom_objects_ze1_clone_obj;
- dom_ze1_object_handlers.has_property = dom_property_exists;
-
zend_hash_init(&classes, 0, NULL, NULL, 1);
INIT_CLASS_ENTRY(ce, "DOMException", php_dom_domexception_class_functions);
http://cvs.php.net/viewcvs.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.1&r2=1.151.2.22.2.2&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.1
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.2
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.1 Tue May 9 23:58:46 2006
+++ php-src/ext/simplexml/simplexml.c Wed May 10 19:39:46 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.1 2006/05/09 23:58:46 helly Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.2 2006/05/10 19:39:46 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1682,38 +1682,6 @@
sxe_count_elements
};
-static zend_object_handlers sxe_ze1_object_handlers = {
- ZEND_OBJECTS_STORE_HANDLERS,
- sxe_property_read,
- sxe_property_write,
- sxe_dimension_read,
- sxe_dimension_write,
- sxe_property_get_adr,
- sxe_get_value, /* get */
- NULL,
- sxe_property_exists,
- sxe_property_delete,
- sxe_dimension_exists,
- sxe_dimension_delete,
- sxe_properties_get,
- NULL, /* zend_get_std_object_handlers()->get_method,*/
- NULL, /* zend_get_std_object_handlers()->call_method,*/
- NULL, /* zend_get_std_object_handlers()->get_constructor, */
- NULL, /* zend_get_std_object_handlers()->get_class_entry,*/
- NULL, /* zend_get_std_object_handlers()->get_class_name,*/
- sxe_objects_compare,
- sxe_object_cast,
- sxe_count_elements
-};
-
-static zend_object_value sxe_object_ze1_clone(zval *zobject TSRMLS_DC)
-{
- php_error(E_ERROR, "Cannot clone object of class %s due to
'zend.ze1_compatibility_mode'", Z_OBJCE_P(zobject)->name);
- /* Return zobject->value.obj just to satisfy compiler */
- /* FIXME: Should not be a fatal */
- return zobject->value.obj;
-}
-
/* {{{ sxe_object_clone()
*/
static void
@@ -2270,12 +2238,6 @@
sxe_object_handlers.get_class_entry = zend_get_std_object_handlers()->get_class_entry;
sxe_object_handlers.get_class_name = zend_get_std_object_handlers()->get_class_name;
- sxe_ze1_object_handlers.get_method = zend_get_std_object_handlers()->get_method;
- sxe_ze1_object_handlers.get_constructor = zend_get_std_object_handlers()->get_constructor;
- sxe_ze1_object_handlers.get_class_entry = zend_get_std_object_handlers()->get_class_entry;
- sxe_ze1_object_handlers.get_class_name = zend_get_std_object_handlers()->get_class_name;
- sxe_ze1_object_handlers.clone_obj = sxe_object_ze1_clone;
-
#ifdef HAVE_SPL
if (zend_get_module_started("spl") == SUCCESS) {
PHP_MINIT(spl_sxe)(INIT_FUNC_ARGS_PASSTHRU);
@@ -2302,7 +2264,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.1 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.151.2.22.2.2 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");