rrichards Wed May 10 19:34:47 2006 UTC
Modified files:
/php-src/ext/xmlwriter php_xmlwriter.c
Log:
fix compiler warnings
http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlwriter/php_xmlwriter.c?r1=1.33&r2=1.34&diff_format=u
Index: php-src/ext/xmlwriter/php_xmlwriter.c
diff -u php-src/ext/xmlwriter/php_xmlwriter.c:1.33
php-src/ext/xmlwriter/php_xmlwriter.c:1.34
--- php-src/ext/xmlwriter/php_xmlwriter.c:1.33 Tue May 9 22:12:50 2006
+++ php-src/ext/xmlwriter/php_xmlwriter.c Wed May 10 19:34:47 2006
@@ -4,7 +4,7 @@
+----------------------------------------------------------------------+
| Copyright (c) 1997-2006 The PHP Group |
+----------------------------------------------------------------------+
- | This source file is subject to version 3.01 of the PHP license, |
+ | This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_01.txt. |
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_xmlwriter.c,v 1.33 2006/05/09 22:12:50 helly Exp $ */
+/* $Id: php_xmlwriter.c,v 1.34 2006/05/10 19:34:47 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -246,8 +246,8 @@
int isFileUri = 0;
uri = xmlCreateURI();
- escsource = xmlURIEscapeStr(source, ":");
- xmlParseURIReference(uri, escsource);
+ escsource = xmlURIEscapeStr((xmlChar *)source, (xmlChar *) ":");
+ xmlParseURIReference(uri, (char *)escsource);
xmlFree(escsource);
if (uri->scheme != NULL) {
@@ -386,7 +386,7 @@
ptr = intern->ptr;
if (ptr) {
- retval = internal_function(ptr, name);
+ retval = internal_function(ptr, (xmlChar *) name);
if (retval != -1) {
RETURN_TRUE;
}
@@ -528,7 +528,7 @@
ptr = intern->ptr;
if (ptr) {
- retval = xmlTextWriterStartAttributeNS(ptr, prefix, name, uri);
+ retval = xmlTextWriterStartAttributeNS(ptr, (xmlChar *)prefix,
(xmlChar *)name, (xmlChar *)uri);
if (retval != -1) {
RETURN_TRUE;
}
@@ -573,7 +573,7 @@
ptr = intern->ptr;
if (ptr) {
- retval = xmlTextWriterWriteAttribute(ptr, name, content);
+ retval = xmlTextWriterWriteAttribute(ptr, (xmlChar *)name,
(xmlChar *)content);
if (retval != -1) {
RETURN_TRUE;
}
@@ -618,7 +618,7 @@
ptr = intern->ptr;
if (ptr) {
- retval = xmlTextWriterWriteAttributeNS(ptr, prefix, name, uri,
content);
+ retval = xmlTextWriterWriteAttributeNS(ptr, (xmlChar *)prefix,
(xmlChar *)name, (xmlChar *)uri, (xmlChar *)content);
if (retval != -1) {
RETURN_TRUE;
}
@@ -671,7 +671,7 @@
ptr = intern->ptr;
if (ptr) {
- retval = xmlTextWriterStartElementNS(ptr, prefix, name, uri);
+ retval = xmlTextWriterStartElementNS(ptr, (xmlChar *)prefix,
(xmlChar *)name, (xmlChar *)uri);
if (retval != -1) {
RETURN_TRUE;
}
@@ -731,7 +731,7 @@
ptr = intern->ptr;
if (ptr) {
- retval = xmlTextWriterWriteElement(ptr, name, content);
+ retval = xmlTextWriterWriteElement(ptr, (xmlChar *)name,
(xmlChar *)content);
if (retval != -1) {
RETURN_TRUE;
}
@@ -775,7 +775,7 @@
ptr = intern->ptr;
if (ptr) {
- retval = xmlTextWriterWriteElementNS(ptr, prefix, name, uri,
content);
+ retval = xmlTextWriterWriteElementNS(ptr, (xmlChar *)prefix,
(xmlChar *)name, (xmlChar *)uri, (xmlChar *)content);
if (retval != -1) {
RETURN_TRUE;
}
@@ -835,7 +835,7 @@
ptr = intern->ptr;
if (ptr) {
- retval = xmlTextWriterWritePI(ptr, name, content);
+ retval = xmlTextWriterWritePI(ptr, (xmlChar *)name, (xmlChar
*)content);
if (retval != -1) {
RETURN_TRUE;
}
@@ -1045,7 +1045,7 @@
ptr = intern->ptr;
if (ptr) {
- retval = xmlTextWriterStartDTD(ptr, name, pubid, sysid);
+ retval = xmlTextWriterStartDTD(ptr, (xmlChar *)name, (xmlChar
*)pubid, (xmlChar *)sysid);
if (retval != -1) {
RETURN_TRUE;
}
@@ -1095,7 +1095,7 @@
ptr = intern->ptr;
if (ptr) {
- retval = xmlTextWriterWriteDTD(ptr, name, pubid, sysid, subset);
+ retval = xmlTextWriterWriteDTD(ptr, (xmlChar *)name, (xmlChar
*)pubid, (xmlChar *)sysid, (xmlChar *)subset);
if (retval != -1) {
RETURN_TRUE;
}
@@ -1154,7 +1154,7 @@
ptr = intern->ptr;
if (ptr) {
- retval = xmlTextWriterWriteDTDElement(ptr, name, content);
+ retval = xmlTextWriterWriteDTDElement(ptr, (xmlChar *)name,
(xmlChar *)content);
if (retval != -1) {
RETURN_TRUE;
}
@@ -1216,7 +1216,7 @@
ptr = intern->ptr;
if (ptr) {
- retval = xmlTextWriterWriteDTDAttlist(ptr, name, content);
+ retval = xmlTextWriterWriteDTDAttlist(ptr, (xmlChar *)name,
(xmlChar *)content);
if (retval != -1) {
RETURN_TRUE;
}
@@ -1260,7 +1260,7 @@
ptr = intern->ptr;
if (ptr) {
- retval = xmlTextWriterStartDTDEntity(ptr, isparm, name);
+ retval = xmlTextWriterStartDTDEntity(ptr, isparm, (xmlChar
*)name);
if (retval != -1) {
RETURN_TRUE;
}
@@ -1312,7 +1312,7 @@
ptr = intern->ptr;
if (ptr) {
- retval = xmlTextWriterWriteDTDAttlist(ptr, name, content);
+ retval = xmlTextWriterWriteDTDAttlist(ptr, (xmlChar *)name,
(xmlChar *)content);
if (retval != -1) {
RETURN_TRUE;
}
@@ -1492,7 +1492,7 @@
}
output_bytes = xmlTextWriterFlush(ptr);
if (buffer) {
- RETVAL_STRING(buffer->content, 1);
+ RETVAL_STRING((char *) buffer->content, 1);
if (empty) {
xmlBufferEmpty(buffer);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
