cvs: php4 /ext/domxml php_domxml.c
| From: | Moriyoshi Koizumi | Date: | Thu, 05 Jun 2003 18:59:55 +0000 |
| Subject: | cvs: php4 /ext/domxml php_domxml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-21553@lists.php.net to get a copy of this message | ||
moriyoshi Thu Jun 5 14:59:55 2003 EDT
Modified files:
/php4/ext/domxml php_domxml.c
Log:
Avoid unnecessary zval separation
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.255 php4/ext/domxml/php_domxml.c:1.256
--- php4/ext/domxml/php_domxml.c:1.255 Mon Jun 2 14:57:59 2003
+++ php4/ext/domxml/php_domxml.c Thu Jun 5 14:59:55 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.255 2003/06/02 18:57:59 rrichards Exp $ */
+/* $Id: php_domxml.c,v 1.256 2003/06/05 18:59:55 moriyoshi Exp $ */
/* TODO
* - Support Notation Nodes
@@ -1090,8 +1090,10 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid argument or parameter array");
return NULL;
} else {
- SEPARATE_ZVAL(value);
- convert_to_string_ex(value);
+ if (Z_TYPE_PP(value) != IS_STRING) {
+ SEPARATE_ZVAL(value);
+ convert_to_string(*value);
+ }
expr = Z_STRVAL_PP(value);
if (expr) {
@@ -5481,8 +5483,10 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid argument or parameter array");
return NULL;
} else {
- SEPARATE_ZVAL(value);
- convert_to_string_ex(value);
+ if (Z_TYPE_PP(value) != IS_STRING) {
+ SEPARATE_ZVAL(value);
+ convert_to_string(*value);
+ }
if (!xpath_params) {
xpath_expr = php_domxslt_string_to_xpathexpr(Z_STRVAL_PP(value) TSRMLS_CC);