diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-06-30 04:05:24 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-06-30 04:05:24 +0300 |
| commit | 4a2e40bb861bc3cf5fb6863e57486ed60316e97c (patch) | |
| tree | 6579660b282fdd1bc50095e48d702913a0b6aa97 /ext/dom/xpath.c | |
| parent | 8cce5b2641fb91c3073018b59f6f044b843041a8 (diff) | |
| download | php-git-4a2e40bb861bc3cf5fb6863e57486ed60316e97c.tar.gz | |
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
Diffstat (limited to 'ext/dom/xpath.c')
| -rw-r--r-- | ext/dom/xpath.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c index 63a877b3a1..6e7d7519c7 100644 --- a/ext/dom/xpath.c +++ b/ext/dom/xpath.c @@ -194,9 +194,9 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, fci.no_separation = 0; if (!zend_make_callable(&fci.function_name, &callable)) { - php_error_docref(NULL, E_WARNING, "Unable to call handler %s()", callable->val); + php_error_docref(NULL, E_WARNING, "Unable to call handler %s()", ZSTR_VAL(callable)); } else if (intern->registerPhpFunctions == 2 && zend_hash_exists(intern->registered_phpfunctions, callable) == 0) { - php_error_docref(NULL, E_WARNING, "Not allowed to call handler '%s()'.", callable->val); + php_error_docref(NULL, E_WARNING, "Not allowed to call handler '%s()'.", ZSTR_VAL(callable)); /* Push an empty string, so that we at least have an xslt result... */ valuePush(ctxt, xmlXPathNewString((xmlChar *)"")); } else { @@ -221,7 +221,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, valuePush(ctxt, xmlXPathNewString((xmlChar *)"")); } else { zend_string *str = zval_get_string(&retval); - valuePush(ctxt, xmlXPathNewString((xmlChar *) str->val)); + valuePush(ctxt, xmlXPathNewString((xmlChar *) ZSTR_VAL(str))); zend_string_release(str); } zval_ptr_dtor(&retval); |