rrichards Sun Feb 20 16:49:45 2005 EDT
Modified files:
/php-src/ext/libxml php_libxml.h libxml.c
Log:
add function to allow extensions to use new error handling if set by user
http://cvs.php.net/diff.php/php-src/ext/libxml/php_libxml.h?r1=1.12&r2=1.13&ty=u
Index: php-src/ext/libxml/php_libxml.h
diff -u php-src/ext/libxml/php_libxml.h:1.12
php-src/ext/libxml/php_libxml.h:1.13
--- php-src/ext/libxml/php_libxml.h:1.12 Thu Feb 10 10:52:38 2005
+++ php-src/ext/libxml/php_libxml.h Sun Feb 20 16:49:45 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_libxml.h,v 1.12 2005/02/10 15:52:38 rrichards Exp $ */
+/* $Id: php_libxml.h,v 1.13 2005/02/20 21:49:45 rrichards Exp $ */
#ifndef PHP_LIBXML_H
#define PHP_LIBXML_H
@@ -88,6 +88,7 @@
void php_libxml_ctx_error(void *ctx, const char *msg, ...);
PHP_LIBXML_API int php_libxml_xmlCheckUTF8(const unsigned char *s);
PHP_LIBXML_API zval *php_libxml_switch_context(zval *context TSRMLS_DC);
+PHP_LIBXML_API void php_libxml_issue_error(int level, const char *msg
TSRMLS_DC);
#endif /* HAVE_LIBXML */
http://cvs.php.net/diff.php/php-src/ext/libxml/libxml.c?r1=1.28&r2=1.29&ty=u
Index: php-src/ext/libxml/libxml.c
diff -u php-src/ext/libxml/libxml.c:1.28 php-src/ext/libxml/libxml.c:1.29
--- php-src/ext/libxml/libxml.c:1.28 Thu Feb 10 10:52:38 2005
+++ php-src/ext/libxml/libxml.c Sun Feb 20 16:49:45 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: libxml.c,v 1.28 2005/02/10 15:52:38 rrichards Exp $ */
+/* $Id: libxml.c,v 1.29 2005/02/20 21:49:45 rrichards Exp $ */
#define IS_EXT_MODULE
@@ -388,6 +388,15 @@
}
}
+void php_libxml_issue_error(int level, const char *msg TSRMLS_DC)
+{
+ if (LIBXML(error_list)) {
+ _php_list_set_error_structure(NULL, msg);
+ } else {
+ php_error_docref(NULL TSRMLS_CC, level, "%s", msg);
+ }
+}
+
static void php_libxml_internal_error_handler(int error_type, void *ctx, const
char **msg, va_list ap)
{
char *buf;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
