MFB: remove fprintf usage

Ilia Alshanetsky · Ilia Alshanetsky · commit eaa3298b4ade · 2008-12-17T21:45:31.000Z
diff --git 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
@@ -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;
          }
       }

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,13 @@ static const char rcsid[] = "#(@) $Id$";`
`43`	`43`	`* 9/1999 - 10/2000`
`44`	`44`	`* HISTORY`
`45`	`45`	`* $Log$`
	`46`	`+ * Revision 1.8.4.4 2008/09/10 00:09:04 felipe`
	`47`	`+ * MFH:`
	`48`	`+ * - Merged fix from SF project (Import Jeff Lawsons patches for XML datetime bug fixes)`
	`49`	`+ * Fixed bugs:`
	`50`	`+ * #45226 (xmlrpc_set_type() segfaults with valid ISO8601 date string)`
	`51`	`+ * #18916 (xmlrpc_set_type() "not working")`
	`52`	`+ *`
`46`	`53`	`* Revision 1.8.4.3 2007/09/18 19:49:53 iliaa`
`47`	`54`	`*`
`48`	`55`	`* Fixed bug #42189 (xmlrpc_set_type() crashes php on invalid datetime`
`@@ -1161,13 +1168,13 @@ int XMLRPC_AddValueToVector(XMLRPC_VALUE target, XMLRPC_VALUE source) {`
`1161`	`1168`	`}`
`1162`	`1169`	`}`
`1163`	`1170`	`else {`
`1164`		`- fprintf (stderr,`
`1165`		`- "xmlrpc: attempted to add key/val pair to vector of type array\n");`
	`1171`	`+/* fprintf (stderr,`
	`1172`	`+ "xmlrpc: attempted to add key/val pair to vector of type array\n"); */`
`1166`	`1173`	`}`
`1167`	`1174`	`break;`
`1168`	`1175`	`default:`
`1169`		`- fprintf (stderr,`
`1170`		`- "xmlrpc: attempted to add value of unknown type to vector\n");`
	`1176`	`+/* fprintf (stderr,`
	`1177`	`+ "xmlrpc: attempted to add value of unknown type to vector\n"); */`
`1171`	`1178`	`break;`
`1172`	`1179`	`}`
`1173`	`1180`	`}`
`@@ -1497,8 +1504,8 @@ void XMLRPC_CleanupValue(XMLRPC_VALUE value) {`
`1497`	`1504`	`my_free(value);`
`1498`	`1505`	`break;`
`1499`	`1506`	`default:`
`1500`		`- fprintf (stderr,`
`1501`		`- "xmlrpc: attempted to free value of invalid type\n");`
	`1507`	`+/* fprintf (stderr,`
	`1508`	`+ "xmlrpc: attempted to free value of invalid type\n"); */`
`1502`	`1509`	`break;`
`1503`	`1510`	`}`
`1504`	`1511`	`}`