implement stricterrorcheck

fix clonenode
cleanup error routines
forgot these files

diff --git a/ext/dom/php_dom.h b/ext/dom/php_dom.h
index 6bdf13952f8bb32add2a12a715d327449ff87582..c162de4e3cd48ae8379900f7f5e50ec47af3d9f2 100644 (file)
--- a/ext/dom/php_dom.h
+++ b/ext/dom/php_dom.h
@@ -71,7 +71,8 @@ zend_object_value dom_objects_new(zend_class_entry *class_type TSRMLS_DC);
 #if defined(LIBXML_XPATH_ENABLED)
 zend_object_value dom_xpath_objects_new(zend_class_entry *class_type TSRMLS_DC);
 #endif
-void php_dom_throw_error(int error_code, zval **retval TSRMLS_DC);
+int dom_get_strict_error(dom_ref_obj *document);
+void php_dom_throw_error(int error_code, int strict_error TSRMLS_DC);
 void node_free_resource(xmlNodePtr node TSRMLS_DC);
 void node_list_unlink(xmlNodePtr node TSRMLS_DC);
 int decrement_node_ptr(dom_object *object TSRMLS_DC);

diff --git a/ext/dom/xml_common.h b/ext/dom/xml_common.h
index 629538232bcd488412420dfa64bce3e60d3ce976..f309da5d9638dd2578d32b23677e42795a282454 100644 (file)
--- a/ext/dom/xml_common.h
+++ b/ext/dom/xml_common.h
@@ -25,6 +25,7 @@
 typedef struct _dom_ref_obj {
        void *ptr;
        int   refcount;
+       int stricterror;
 } dom_ref_obj;
 
 typedef struct _node_ptr {
@@ -87,13 +88,13 @@ PHP_DOM_EXPORT(void) dom_write_property(zval *object, zval *member, zval *value
 
 #define DOM_RET_OBJ(zval, obj, ret, domobject) \
        if (NULL == (zval = php_dom_create_object(obj, ret, zval, return_value, domobject TSRMLS_CC))) { \
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); \
+               php_error(E_WARNING, "Cannot create required DOM object"); \
                RETURN_FALSE; \
        }
 
 #define DOM_GET_THIS(zval) \
        if (NULL == (zval = getThis())) { \
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Underlying object missing"); \
+               php_error(E_WARNING, "Underlying object missing"); \
                RETURN_FALSE; \
        }
 

diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c
index 21427211d4d5e659206a59bfe00fbdad4f896459..73092bba99649ba7d8d4767653c58b0506f4feb2 100644 (file)
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@@ -92,7 +92,7 @@ int dom_xpath_document_read(dom_object *obj, zval **retval TSRMLS_DC)
 
        ALLOC_ZVAL(*retval);
        if (NULL == (*retval = php_dom_create_object((xmlNodePtr) docp, &ret, NULL, *retval, obj TSRMLS_CC))) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object");
+               php_error(E_WARNING, "Cannot create required DOM object");
                return FAILURE;
        }
        return SUCCESS;
@@ -115,7 +115,7 @@ PHP_FUNCTION(dom_xpath_query)
 
        ctxp = (xmlXPathContextPtr) intern->ptr;
        if (ctxp == NULL) {
-               php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid XPath Context");
+               php_error(E_WARNING, "Invalid XPath Context");
                RETURN_FALSE;
        }