rrichards Sun Feb 20 17:01:25 2005 EDT
Modified files:
/php-src/ext/dom php_dom.h domexception.c
Log:
use new error handling when not throwing exceptions
http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.h?r1=1.25&r2=1.26&ty=u
Index: php-src/ext/dom/php_dom.h
diff -u php-src/ext/dom/php_dom.h:1.25 php-src/ext/dom/php_dom.h:1.26
--- php-src/ext/dom/php_dom.h:1.25 Mon Aug 30 11:07:20 2004
+++ php-src/ext/dom/php_dom.h Sun Feb 20 17:01:24 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.h,v 1.25 2004/08/30 15:07:20 rrichards Exp $ */
+/* $Id: php_dom.h,v 1.26 2005/02/20 22:01:24 rrichards Exp $ */
#ifndef PHP_DOM_H
#define PHP_DOM_H
@@ -91,6 +91,7 @@
#endif
int dom_get_strict_error(php_libxml_ref_obj *document);
void php_dom_throw_error(int error_code, int strict_error TSRMLS_DC);
+void php_dom_throw_error_with_message(int error_code, char *error_message, int
strict_error TSRMLS_DC);
void node_list_unlink(xmlNodePtr node TSRMLS_DC);
int dom_check_qname(char *qname, char **localname, char **prefix, int uri_len,
int name_len);
xmlNsPtr dom_get_ns(xmlNodePtr node, char *uri, int *errorcode, char *prefix);
http://cvs.php.net/diff.php/php-src/ext/dom/domexception.c?r1=1.9&r2=1.10&ty=u
Index: php-src/ext/dom/domexception.c
diff -u php-src/ext/dom/domexception.c:1.9 php-src/ext/dom/domexception.c:1.10
--- php-src/ext/dom/domexception.c:1.9 Mon May 31 08:50:28 2004
+++ php-src/ext/dom/domexception.c Sun Feb 20 17:01:24 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: domexception.c,v 1.9 2004/05/31 12:50:28 rrichards Exp $ */
+/* $Id: domexception.c,v 1.10 2005/02/20 22:01:24 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -41,6 +41,16 @@
{NULL, NULL, NULL}
};
+/* {{{ php_dom_throw_error_with_message */
+void php_dom_throw_error_with_message(int error_code, char *error_message, int
strict_error TSRMLS_DC)
+{
+ if (strict_error == 1) {
+ zend_throw_exception(dom_domexception_class_entry,
error_message, error_code TSRMLS_CC);
+ } else {
+ php_libxml_issue_error(E_WARNING, error_message TSRMLS_CC);
+ }
+}
+
/* {{{ php_dom_throw_error */
void php_dom_throw_error(int error_code, int strict_error TSRMLS_DC)
{
@@ -100,11 +110,7 @@
error_message = "Unhandled Error";
}
- if (strict_error == 1) {
- zend_throw_exception(dom_domexception_class_entry,
error_message, error_code TSRMLS_CC);
- } else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s",
error_message);
- }
+ php_dom_throw_error_with_message(error_code, error_message,
strict_error TSRMLS_CC);
}
/* }}} end php_dom_throw_error */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
