tony2001 Fri Jun 2 21:55:26 2006 UTC
Modified files:
/php-src/ext/dom php_dom.c xml_common.h
Log:
fix error messages in Unicode mode
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/php_dom.c?r1=1.95&r2=1.96&diff_format=u
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.95 php-src/ext/dom/php_dom.c:1.96
--- php-src/ext/dom/php_dom.c:1.95 Wed May 17 16:32:04 2006
+++ php-src/ext/dom/php_dom.c Fri Jun 2 21:55:26 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.c,v 1.95 2006/05/17 16:32:04 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.96 2006/06/02 21:55:26 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -307,7 +307,7 @@
if (obj->prop_handler != NULL) {
ret = zend_u_hash_find(obj->prop_handler, Z_TYPE_P(member),
Z_UNIVAL_P(member), Z_UNILEN_P(member)+1, (void **) &hnd);
} else if (instanceof_function(obj->std.ce, dom_node_class_entry
TSRMLS_CC)) {
- php_error(E_WARNING, "Couldn't fetch %s. Node no longer
exists", obj->std.ce->name);
+ php_error(E_WARNING, "Couldn't fetch %v. Node no longer
exists", obj->std.ce->name);
}
if (ret == SUCCESS) {
ret = hnd->read_func(obj, &retval TSRMLS_CC);
http://cvs.php.net/viewcvs.cgi/php-src/ext/dom/xml_common.h?r1=1.25&r2=1.26&diff_format=u
Index: php-src/ext/dom/xml_common.h
diff -u php-src/ext/dom/xml_common.h:1.25 php-src/ext/dom/xml_common.h:1.26
--- php-src/ext/dom/xml_common.h:1.25 Sun Jan 1 13:09:49 2006
+++ php-src/ext/dom/xml_common.h Fri Jun 2 21:55:26 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xml_common.h,v 1.25 2006/01/01 13:09:49 sniper Exp $ */
+/* $Id: xml_common.h,v 1.26 2006/06/02 21:55:26 tony2001 Exp $ */
#ifndef PHP_XML_COMMON_H
#define PHP_XML_COMMON_H
@@ -58,7 +58,7 @@
#define NODE_GET_OBJ(__ptr, __id, __prtype, __intern) { \
__intern = (php_libxml_node_object *)zend_object_store_get_object(__id
TSRMLS_CC); \
if (__intern->node == NULL || !(__ptr =
(__prtype)__intern->node->node)) { \
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch
%s", __intern->std.ce->name);\
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't fetch
%v", __intern->std.ce->name);\
RETURN_NULL();\
} \
}
@@ -67,7 +67,7 @@
__intern = (php_libxml_node_object *)zend_object_store_get_object(__id
TSRMLS_CC); \
if (__intern->document != NULL) { \
if (!(__ptr = (__prtype)__intern->document->ptr)) { \
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't
fetch %s", __intern->std.ce->name);\
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't
fetch %v", __intern->std.ce->name);\
RETURN_NULL();\
} \
} \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
