From 0816690760bfc4bfaf30d127666ab4e40a1065e3 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Fri, 2 Jun 2006 21:55:26 +0000 Subject: [PATCH] fix error messages in Unicode mode --- ext/dom/php_dom.c | 2 +- ext/dom/xml_common.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index fd9f40063f..6646da1392 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -307,7 +307,7 @@ zval *dom_read_property(zval *object, zval *member, int type TSRMLS_DC) 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); diff --git a/ext/dom/xml_common.h b/ext/dom/xml_common.h index a957ed61b8..5813c46d00 100644 --- a/ext/dom/xml_common.h +++ b/ext/dom/xml_common.h @@ -58,7 +58,7 @@ PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj); #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 @@ PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj); __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();\ } \ } \ -- 2.50.1