diff options
| author | Nikita Popov <nikic@php.net> | 2014-09-03 21:35:53 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-09-03 21:35:53 +0200 |
| commit | d85ab21ac44873d4be6ea44c91a002ceac6b08fa (patch) | |
| tree | 76e1fecfda9181594b3b5de94d4baf800fa76da0 /ext/dom/xpath.c | |
| parent | 2b133e9149eca862c7d8c37f19d95e940970afec (diff) | |
| download | php-git-d85ab21ac44873d4be6ea44c91a002ceac6b08fa.tar.gz | |
Fix DOM warnings
Diffstat (limited to 'ext/dom/xpath.c')
| -rw-r--r-- | ext/dom/xpath.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/dom/xpath.c b/ext/dom/xpath.c index 7a7f7a81e1..107994f972 100644 --- a/ext/dom/xpath.c +++ b/ext/dom/xpath.c @@ -186,7 +186,7 @@ static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, } return; } - ZVAL_STRING(&fci.function_name, obj->stringval); + ZVAL_STRING(&fci.function_name, (char *) obj->stringval); xmlXPathFreeObject(obj); fci.symbol_table = NULL; @@ -222,7 +222,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(str->val)); + valuePush(ctxt, xmlXPathNewString((xmlChar *) str->val)); zend_string_release(str); } zval_ptr_dtor(&retval); @@ -412,7 +412,7 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */ ctxp->namespaces = ns; ctxp->nsNr = nsnbr; - xpathobjp = xmlXPathEvalExpression(expr, ctxp); + xpathobjp = xmlXPathEvalExpression((xmlChar *) expr, ctxp); ctxp->node = NULL; if (ns != NULL) { @@ -453,12 +453,12 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */ nsparent = node->_private; curns = xmlNewNs(NULL, node->name, NULL); if (node->children) { - curns->prefix = xmlStrdup((char *) node->children); + curns->prefix = xmlStrdup((xmlChar *) node->children); } if (node->children) { - node = xmlNewDocNode(docp, NULL, (char *) node->children, node->name); + node = xmlNewDocNode(docp, NULL, (xmlChar *) node->children, node->name); } else { - node = xmlNewDocNode(docp, NULL, "xmlns", node->name); + node = xmlNewDocNode(docp, NULL, (xmlChar *) "xmlns", node->name); } node->type = XML_NAMESPACE_DECL; node->parent = nsparent; @@ -483,7 +483,7 @@ static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */ break; case XPATH_STRING: - RETVAL_STRING(xpathobjp->stringval); + RETVAL_STRING((char *) xpathobjp->stringval); break; default: |