rrichards Thu Sep 28 10:11:20 2006 UTC
Modified files:
/php-src/ext/dom element.c
Log:
fix some compiler warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/element.c?r1=1.50&r2=1.51&diff_format=u
Index: php-src/ext/dom/element.c
diff -u php-src/ext/dom/element.c:1.50 php-src/ext/dom/element.c:1.51
--- php-src/ext/dom/element.c:1.50 Wed Sep 27 10:32:11 2006
+++ php-src/ext/dom/element.c Thu Sep 28 10:11:20 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: element.c,v 1.50 2006/09/27 10:32:11 rrichards Exp $ */
+/* $Id: element.c,v 1.51 2006/09/28 10:11:20 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -88,7 +88,7 @@
if (uri_len > 0) {
errorcode = dom_check_qname(name, &localname, &prefix, uri_len,
name_len);
if (errorcode == 0) {
- nodep = xmlNewNode (NULL, localname);
+ nodep = xmlNewNode (NULL, (xmlChar *)localname);
if (nodep != NULL && uri != NULL) {
nsptr = dom_get_ns(nodep, uri, &errorcode,
prefix);
xmlSetNs(nodep, nsptr);
@@ -107,7 +107,7 @@
}
} else {
/* If you don't pass a namespace uri, then you can't set a prefix */
- localname = xmlSplitQName2(name, (xmlChar **) &prefix);
+ localname = xmlSplitQName2((xmlChar *)name, (xmlChar **) &prefix);
if (prefix != NULL) {
xmlFree(localname);
xmlFree(prefix);
@@ -123,7 +123,7 @@
}
if (value_len > 0) {
- xmlNodeSetContentLen(nodep, value, value_len);
+ xmlNodeSetContentLen(nodep, (xmlChar *) value, value_len);
}
intern = (dom_object *)zend_object_store_get_object(id TSRMLS_CC);
@@ -161,7 +161,7 @@
qname = xmlStrdup(ns->prefix);
qname = xmlStrcat(qname, ":");
qname = xmlStrcat(qname, nodep->name);
- ZVAL_XML_STRING(*retval, qname, ZSTR_DUPLICATE);
+ ZVAL_XML_STRING(*retval, (char *)qname, ZSTR_DUPLICATE);
xmlFree(qname);
} else {
ZVAL_XML_STRING(*retval, (char *) nodep->name, ZSTR_DUPLICATE);
@@ -309,6 +309,8 @@
break;
case XML_NAMESPACE_DECL:
RETURN_FALSE;
+ default:
+ break;
}
}
@@ -318,7 +320,7 @@
RETURN_TRUE;
}
} else {
- attr = (xmlNodePtr)xmlSetProp(nodep, name, value);
+ attr = (xmlNodePtr)xmlSetProp(nodep, (xmlChar *) name, value);
}
if (!attr) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "No such attribute
'%s'", name);
@@ -371,6 +373,8 @@
break;
case XML_NAMESPACE_DECL:
RETURN_FALSE;
+ default:
+ break;
}
RETURN_TRUE;
@@ -572,13 +576,13 @@
DOM_GET_OBJ(elemp, id, xmlNodePtr, intern);
- strattr = xmlGetNsProp(elemp, name, uri);
+ strattr = xmlGetNsProp(elemp, (xmlChar *) name, (xmlChar *) uri);
if (strattr != NULL) {
RETVAL_XML_STRING(strattr, ZSTR_DUPLICATE);
xmlFree(strattr);
} else {
- if (xmlStrEqual(uri, DOM_XMLNS_NAMESPACE)) {
+ if (xmlStrEqual((xmlChar *) uri, DOM_XMLNS_NAMESPACE)) {
nsptr = dom_get_nsdecl(elemp, name);
if (nsptr != NULL) {
RETVAL_XML_STRING((char *) nsptr->href,
ZSTR_DUPLICATE);
@@ -668,12 +672,12 @@
if (errorcode == 0) {
if (uri_len > 0) {
- nodep = (xmlNodePtr) xmlHasNsProp(elemp, localname,
uri);
+ nodep = (xmlNodePtr) xmlHasNsProp(elemp, (xmlChar *)
localname, (xmlChar *) uri);
if (nodep != NULL && nodep->type != XML_ATTRIBUTE_DECL)
{
node_list_unlink(nodep->children TSRMLS_CC);
}
- if (xmlStrEqual(prefix,"xmlns") && xmlStrEqual(uri,
DOM_XMLNS_NAMESPACE)) {
+ if (xmlStrEqual((xmlChar *) prefix,"xmlns") &&
xmlStrEqual((xmlChar *) uri, DOM_XMLNS_NAMESPACE)) {
is_xmlns = 1;
nsptr = dom_get_nsdecl(elemp, localname);
} else {
@@ -766,11 +770,11 @@
RETURN_NULL();
}
- attrp = xmlHasNsProp(nodep, name, uri);
+ attrp = xmlHasNsProp(nodep, (xmlChar *)name, (xmlChar *)uri);
- nsptr = dom_get_nsdecl(nodep, name);
+ nsptr = dom_get_nsdecl(nodep, (xmlChar *)name);
if (nsptr != NULL) {
- if (xmlStrEqual(uri, nsptr->href)) {
+ if (xmlStrEqual((xmlChar *)uri, nsptr->href)) {
if (nsptr->href != NULL) {
xmlFree((char *) nsptr->href);
nsptr->href = NULL;
@@ -818,7 +822,7 @@
DOM_GET_OBJ(elemp, id, xmlNodePtr, intern);
- attrp = xmlHasNsProp(elemp, name, uri);
+ attrp = xmlHasNsProp(elemp, (xmlChar *)name, (xmlChar *)uri);
if (attrp == NULL) {
RETURN_NULL();
@@ -970,7 +974,8 @@
xmlNs *nsp;
dom_object *intern;
int uri_len, name_len;
- char *uri, *name, *value;
+ char *uri, *name;
+ xmlChar *value;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
"Os!&s&", &id, dom_element_class_entry, &uri, &uri_len, UG(utf8_conv), &name,
&name_len, UG(utf8_conv)) == FAILURE) {
return;
@@ -978,7 +983,7 @@
DOM_GET_OBJ(elemp, id, xmlNodePtr, intern);
- value = xmlGetNsProp(elemp, name, uri);
+ value = xmlGetNsProp(elemp, (xmlChar *)name, (xmlChar *)uri);
if (value != NULL) {
xmlFree(value);
@@ -1077,7 +1082,7 @@
RETURN_NULL();
}
- attrp = xmlHasNsProp(elemp, name, uri);
+ attrp = xmlHasNsProp(elemp, (xmlChar *)name, (xmlChar *)uri);
if (attrp == NULL || attrp->type == XML_ATTRIBUTE_DECL) {
php_dom_throw_error(NOT_FOUND_ERR,
dom_get_strict_error(intern->document) TSRMLS_CC);
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
