diff options
Diffstat (limited to 'ext/xsl/xsltprocessor.c')
| -rw-r--r-- | ext/xsl/xsltprocessor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/xsl/xsltprocessor.c b/ext/xsl/xsltprocessor.c index f39d17105e..f5a8fa8e33 100644 --- a/ext/xsl/xsltprocessor.c +++ b/ext/xsl/xsltprocessor.c @@ -163,7 +163,7 @@ static char **php_xsl_xslt_make_params(HashTable *parht, int xpath_params) xpath_expr = estrndup(Z_STRVAL_P(value), Z_STRLEN_P(value)); } if (xpath_expr) { - params[i++] = estrndup(string_key->val, string_key->len); + params[i++] = estrndup(ZSTR_VAL(string_key), ZSTR_LEN(string_key)); params[i++] = xpath_expr; } } @@ -321,10 +321,10 @@ static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int t fci.no_separation = 0; /*fci.function_handler_cache = &function_ptr;*/ if (!zend_make_callable(&handler, &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)); valuePush(ctxt, xmlXPathNewString("")); } 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("")); } else { @@ -651,7 +651,7 @@ PHP_FUNCTION(xsl_xsltprocessor_transform_to_doc) if (ce == NULL || !instanceof_function(ce, curce)) { xmlFreeDoc(newdocp); php_error_docref(NULL, E_WARNING, - "Expecting class compatible with %s, '%s' given", curclass_name->val, ret_class->val); + "Expecting class compatible with %s, '%s' given", ZSTR_VAL(curclass_name), ZSTR_VAL(ret_class)); RETURN_FALSE; } |