summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2008-12-17 21:45:31 +0000
committerIlia Alshanetsky <iliaa@php.net>2008-12-17 21:45:31 +0000
commiteaa3298b4adeb9af5756d0c81e1476097db8a656 (patch)
tree3e5d3a273ae6207a6507fde21ec2c85020aa47d1
parenta54f690ae0a29d18922fc0301e18f11dccce1819 (diff)
downloadphp-git-eaa3298b4adeb9af5756d0c81e1476097db8a656.tar.gz
MFB: remove fprintf usage
-rw-r--r--ext/xmlrpc/libxmlrpc/xml_element.c10
-rw-r--r--ext/xmlrpc/libxmlrpc/xmlrpc.c19
2 files changed, 20 insertions, 9 deletions
diff --git a/ext/xmlrpc/libxmlrpc/xml_element.c b/ext/xmlrpc/libxmlrpc/xml_element.c
index 5c79bfcba4..8d15549802 100644
--- a/ext/xmlrpc/libxmlrpc/xml_element.c
+++ b/ext/xmlrpc/libxmlrpc/xml_element.c
@@ -44,6 +44,10 @@ static const char rcsid[] = "#(@) $Id$";
* 06/2000
* HISTORY
* $Log$
+ * Revision 1.9.4.2 2008/12/17 00:30:48 iliaa
+ *
+ * MFH: removed unused var
+ *
* Revision 1.9.4.1 2006/07/30 11:34:02 tony2001
* MFH: fix compile warnings (#38257)
*
@@ -378,7 +382,7 @@ static void xml_element_serialize(xml_element *el, int (*fptr)(void *data, const
depth++;
if(!el) {
- fprintf(stderr, "Nothing to write\n");
+/* fprintf(stderr, "Nothing to write\n"); */
return;
}
if(!options) {
@@ -725,7 +729,7 @@ xml_element* xml_elem_parse_buf(const char* in_buf, int len, XML_ELEM_INPUT_OPTI
byte_idx > 10 ? 10 : byte_idx,
in_buf + (byte_idx > 10 ? byte_idx - 10 : byte_idx));
}
-
+/*
fprintf(stderr, "expat reports error code %i\n"
"\tdescription: %s\n"
"\tline: %i\n"
@@ -734,7 +738,7 @@ xml_element* xml_elem_parse_buf(const char* in_buf, int len, XML_ELEM_INPUT_OPTI
"\ttotal bytes: %i\n%s ",
err_code, error_str, line_num,
col_num, byte_idx, byte_total, buf);
-
+*/
/* error condition */
if(error) {
diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc.c b/ext/xmlrpc/libxmlrpc/xmlrpc.c
index 7b27caee3e..9852b88632 100644
--- a/ext/xmlrpc/libxmlrpc/xmlrpc.c
+++ b/ext/xmlrpc/libxmlrpc/xmlrpc.c
@@ -43,6 +43,13 @@ static const char rcsid[] = "#(@) $Id$";
* 9/1999 - 10/2000
* HISTORY
* $Log$
+ * Revision 1.8.4.4 2008/09/10 00:09:04 felipe
+ * MFH:
+ * - Merged fix from SF project (Import Jeff Lawsons patches for XML datetime bug fixes)
+ * Fixed bugs:
+ * #45226 (xmlrpc_set_type() segfaults with valid ISO8601 date string)
+ * #18916 (xmlrpc_set_type() "not working")
+ *
* Revision 1.8.4.3 2007/09/18 19:49:53 iliaa
*
* Fixed bug #42189 (xmlrpc_set_type() crashes php on invalid datetime
@@ -1161,13 +1168,13 @@ int XMLRPC_AddValueToVector(XMLRPC_VALUE target, XMLRPC_VALUE source) {
}
}
else {
- fprintf (stderr,
- "xmlrpc: attempted to add key/val pair to vector of type array\n");
+/* fprintf (stderr,
+ "xmlrpc: attempted to add key/val pair to vector of type array\n"); */
}
break;
default:
- fprintf (stderr,
- "xmlrpc: attempted to add value of unknown type to vector\n");
+/* fprintf (stderr,
+ "xmlrpc: attempted to add value of unknown type to vector\n"); */
break;
}
}
@@ -1497,8 +1504,8 @@ void XMLRPC_CleanupValue(XMLRPC_VALUE value) {
my_free(value);
break;
default:
- fprintf (stderr,
- "xmlrpc: attempted to free value of invalid type\n");
+/* fprintf (stderr,
+ "xmlrpc: attempted to free value of invalid type\n"); */
break;
}
}