[PHP-CVS] cvs: php-src /ext/dom php_dom.h xml_common.h xpath.c

[Rob Richards]

rrichards               Sun Aug 24 06:24:23 2003 EDT

  Modified files:              
    /php-src/ext/dom    xpath.c xml_common.h php_dom.h 
  Log:
  implement stricterrorcheck
  fix clonenode
  cleanup error routines
  forgot these files
  
Index: php-src/ext/dom/xpath.c
diff -u php-src/ext/dom/xpath.c:1.2 php-src/ext/dom/xpath.c:1.3
--- php-src/ext/dom/xpath.c:1.2 Fri Aug 22 11:04:10 2003
+++ php-src/ext/dom/xpath.c     Sun Aug 24 06:24:22 2003
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: xpath.c,v 1.2 2003/08/22 15:04:10 wez Exp $ */
+/* $Id: xpath.c,v 1.3 2003/08/24 10:24:22 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -92,7 +92,7 @@
 
        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 @@
 
        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;
        }
 
Index: php-src/ext/dom/xml_common.h
diff -u php-src/ext/dom/xml_common.h:1.12 php-src/ext/dom/xml_common.h:1.13
--- php-src/ext/dom/xml_common.h:1.12   Thu Jul 24 09:18:40 2003
+++ php-src/ext/dom/xml_common.h        Sun Aug 24 06:24:22 2003
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: xml_common.h,v 1.12 2003/07/24 13:18:40 rrichards Exp $ */
+/* $Id: xml_common.h,v 1.13 2003/08/24 10:24:22 rrichards Exp $ */
 
 #ifndef PHP_XML_COMMON_H
 #define PHP_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 @@
 
 #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; \
        }
 
Index: php-src/ext/dom/php_dom.h
diff -u php-src/ext/dom/php_dom.h:1.13 php-src/ext/dom/php_dom.h:1.14
--- php-src/ext/dom/php_dom.h:1.13      Sun Jul 27 13:57:05 2003
+++ php-src/ext/dom/php_dom.h   Sun Aug 24 06:24:22 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_dom.h,v 1.13 2003/07/27 17:57:05 rrichards Exp $ */
+/* $Id: php_dom.h,v 1.14 2003/08/24 10:24:22 rrichards Exp $ */
 
 #ifndef PHP_DOM_H
 #define PHP_DOM_H
@@ -71,7 +71,8 @@
 #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);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php