[PHP-CVS] cvs: php-src /ext/xmlrpc/libxmlrpc xml_element.c

2008-12-16 Thread Ilia Alshanetsky 
iliaa   Wed Dec 17 00:30:59 2008 UTC

  Modified files:  
/php-src/ext/xmlrpc/libxmlrpc   xml_element.c 
  Log:
  
  MFB: removed unused var
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xml_element.c?r1=1.12r2=1.13diff_format=u
Index: php-src/ext/xmlrpc/libxmlrpc/xml_element.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.12 
php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.13
--- php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.12 Tue Dec  9 17:20:57 2008
+++ php-src/ext/xmlrpc/libxmlrpc/xml_element.c  Wed Dec 17 00:30:59 2008
@@ -31,7 +31,7 @@
 */
 
 
-static const char rcsid[] = #(@) $Id: xml_element.c,v 1.12 2008/12/09 
17:20:57 iliaa Exp $;
+static const char rcsid[] = #(@) $Id: xml_element.c,v 1.13 2008/12/17 
00:30:59 iliaa Exp $;
 
 
 
@@ -44,6 +44,10 @@
  *   06/2000
  * HISTORY
  *   $Log: xml_element.c,v $
+ *   Revision 1.13  2008/12/17 00:30:59  iliaa
+ *
+ *   MFB: removed unused var
+ *
  *   Revision 1.12  2008/12/09 17:20:57  iliaa
  *   Comment out fprintf() use inside the library
  *
@@ -722,7 +726,7 @@
  int line_num = XML_GetCurrentLineNumber(parser);
  int col_num = XML_GetCurrentColumnNumber(parser);
  long byte_idx = XML_GetCurrentByteIndex(parser);
- int byte_total = XML_GetCurrentByteCount(parser);
+/* int byte_total = XML_GetCurrentByteCount(parser); */
  const char * error_str = XML_ErrorString(err_code);
  if(byte_idx = 0) {
  snprintf(buf, 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/xmlrpc/libxmlrpc xml_element.c xmlrpc.c

2008-12-09 Thread Ilia Alshanetsky 
iliaa   Tue Dec  9 17:20:57 2008 UTC

  Modified files:  
/php-src/ext/xmlrpc/libxmlrpc   xml_element.c xmlrpc.c 
  Log:
  Comment out fprintf() use inside the library
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xml_element.c?r1=1.11r2=1.12diff_format=u
Index: php-src/ext/xmlrpc/libxmlrpc/xml_element.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.11 
php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.12
--- php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.11 Mon Jan  1 09:29:33 2007
+++ php-src/ext/xmlrpc/libxmlrpc/xml_element.c  Tue Dec  9 17:20:57 2008
@@ -31,7 +31,7 @@
 */
 
 
-static const char rcsid[] = #(@) $Id: xml_element.c,v 1.11 2007/01/01 
09:29:33 sebastian Exp $;
+static const char rcsid[] = #(@) $Id: xml_element.c,v 1.12 2008/12/09 
17:20:57 iliaa Exp $;
 
 
 
@@ -44,6 +44,9 @@
  *   06/2000
  * HISTORY
  *   $Log: xml_element.c,v $
+ *   Revision 1.12  2008/12/09 17:20:57  iliaa
+ *   Comment out fprintf() use inside the library
+ *
  *   Revision 1.11  2007/01/01 09:29:33  sebastian
  *   Bump year.
  *
@@ -381,7 +384,7 @@
depth++;
 
if(!el) {
-  fprintf(stderr, Nothing to write\n);
+  /* fprintf(stderr, Nothing to write\n); */
   return;
}
if(!options) {
@@ -728,7 +731,7 @@
   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
@@ -737,7 +740,7 @@
 \ttotal bytes: %i\n%s ,
 err_code, error_str, line_num, 
 col_num, byte_idx, byte_total, buf);
-
+*/
 
   /* error condition */
   if(error) {
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c?r1=1.13r2=1.14diff_format=u
Index: php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.13 
php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.14
--- php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.13  Wed Sep 10 00:05:26 2008
+++ php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c   Tue Dec  9 17:20:57 2008
@@ -31,7 +31,7 @@
 */
 
 
-static const char rcsid[] = #(@) $Id: xmlrpc.c,v 1.13 2008/09/10 00:05:26 
felipe Exp $;
+static const char rcsid[] = #(@) $Id: xmlrpc.c,v 1.14 2008/12/09 17:20:57 
iliaa Exp $;
 
 
 /h* ABOUT/xmlrpc
@@ -43,6 +43,9 @@
  *   9/1999 - 10/2000
  * HISTORY
  *   $Log: xmlrpc.c,v $
+ *   Revision 1.14  2008/12/09 17:20:57  iliaa
+ *   Comment out fprintf() use inside the library
+ *
  *   Revision 1.13  2008/09/10 00:05:26  felipe
  *   - Merged fix from SF project (Import Jeff Lawsons patches for XML 
datetime bug fixes)
  * Fixed bugs:
@@ -1170,13 +1173,13 @@
   }
}
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;
  }
   }
@@ -1506,8 +1509,8 @@
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;
  }
   }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/xmlrpc/libxmlrpc xml_element.c

2006-07-30 Thread Antony Dovgal 
tony2001Sun Jul 30 11:33:49 2006 UTC

  Modified files:  
/php-src/ext/xmlrpc/libxmlrpc   xml_element.c 
  Log:
  fix compile warnings (#38257)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/xmlrpc/libxmlrpc/xml_element.c?r1=1.9r2=1.10diff_format=u
Index: php-src/ext/xmlrpc/libxmlrpc/xml_element.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.9 
php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.10
--- php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.9  Fri Apr 22 11:06:53 2005
+++ php-src/ext/xmlrpc/libxmlrpc/xml_element.c  Sun Jul 30 11:33:49 2006
@@ -31,7 +31,7 @@
 */
 
 
-static const char rcsid[] = #(@) $Id: xml_element.c,v 1.9 2005/04/22 11:06:53 
jorton Exp $;
+static const char rcsid[] = #(@) $Id: xml_element.c,v 1.10 2006/07/30 
11:33:49 tony2001 Exp $;
 
 
 
@@ -44,6 +44,9 @@
  *   06/2000
  * HISTORY
  *   $Log: xml_element.c,v $
+ *   Revision 1.10  2006/07/30 11:33:49  tony2001
+ *   fix compile warnings (#38257)
+ *
  *   Revision 1.9  2005/04/22 11:06:53  jorton
  *   Fixed bug #32797 (invalid C code in xmlrpc extension).
  *
@@ -697,8 +700,8 @@
   mydata.input_options = options;
   mydata.needs_enc_conversion = options-encoding  
strcmp(options-encoding, encoding_utf_8);
 
-  XML_SetElementHandler(parser, _xmlrpc_startElement, _xmlrpc_endElement);
-  XML_SetCharacterDataHandler(parser, _xmlrpc_charHandler);
+  XML_SetElementHandler(parser, 
(XML_StartElementHandler)_xmlrpc_startElement, 
(XML_EndElementHandler)_xmlrpc_endElement);
+  XML_SetCharacterDataHandler(parser, 
(XML_CharacterDataHandler)_xmlrpc_charHandler);
 
   /* pass the xml_elem_data struct along */
   XML_SetUserData(parser, (void*)mydata);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/xmlrpc/libxmlrpc xml_element.c

2005-04-22 Thread Joe Orton 
jorton  Fri Apr 22 07:06:55 2005 EDT

  Modified files:  
/php-src/ext/xmlrpc/libxmlrpc   xml_element.c 
  Log:
  Fixed bug #32797 (invalid C code in xmlrpc extension).
  
  
http://cvs.php.net/diff.php/php-src/ext/xmlrpc/libxmlrpc/xml_element.c?r1=1.8r2=1.9ty=u
Index: php-src/ext/xmlrpc/libxmlrpc/xml_element.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.8 
php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.9
--- php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.8  Sun Mar 27 19:07:24 2005
+++ php-src/ext/xmlrpc/libxmlrpc/xml_element.c  Fri Apr 22 07:06:53 2005
@@ -31,7 +31,7 @@
 */
 
 
-static const char rcsid[] = #(@) $Id: xml_element.c,v 1.8 2005/03/28 00:07:24 
edink Exp $;
+static const char rcsid[] = #(@) $Id: xml_element.c,v 1.9 2005/04/22 11:06:53 
jorton Exp $;
 
 
 
@@ -44,6 +44,9 @@
  *   06/2000
  * HISTORY
  *   $Log: xml_element.c,v $
+ *   Revision 1.9  2005/04/22 11:06:53  jorton
+ *   Fixed bug #32797 (invalid C code in xmlrpc extension).
+ *
  *   Revision 1.8  2005/03/28 00:07:24  edink
  *   Reshufle includes to make it compile on windows
  *
@@ -119,7 +122,7 @@
 #include queue.h
 #include encodings.h
 
-#define my_free(thing)  if(thing) {free(thing); thing = 0;}
+#define my_free(thing)  if(thing) {free(thing); thing = NULL;}
 
 #define XML_DECL_START ?xml
 #define XML_DECL_START_LEN sizeof(XML_DECL_START) - 1
@@ -195,7 +198,10 @@
 
   Q_Destroy(root-children);
   Q_Destroy(root-attrs);
-  my_free((char*)root-name);
+  if(root-name) {
+  free((char *)root-name);
+  root-name = NULL;
+  }
   simplestring_free(root-text);
   my_free(root);
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/xmlrpc/libxmlrpc xml_element.c xmlrpc.c

2005-03-27 Thread Edin Kadribasic 
edink   Sun Mar 27 19:07:25 2005 EDT

  Modified files:  
/php-src/ext/xmlrpc/libxmlrpc   xml_element.c xmlrpc.c 
  Log:
  Reshufle includes to make it compile on windows
  
http://cvs.php.net/diff.php/php-src/ext/xmlrpc/libxmlrpc/xml_element.c?r1=1.7r2=1.8ty=u
Index: php-src/ext/xmlrpc/libxmlrpc/xml_element.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.7 
php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.8
--- php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.7  Fri Mar 25 22:13:58 2005
+++ php-src/ext/xmlrpc/libxmlrpc/xml_element.c  Sun Mar 27 19:07:24 2005
@@ -31,7 +31,7 @@
 */
 
 
-static const char rcsid[] = #(@) $Id: xml_element.c,v 1.7 2005/03/26 03:13:58 
sniper Exp $;
+static const char rcsid[] = #(@) $Id: xml_element.c,v 1.8 2005/03/28 00:07:24 
edink Exp $;
 
 
 
@@ -44,6 +44,9 @@
  *   06/2000
  * HISTORY
  *   $Log: xml_element.c,v $
+ *   Revision 1.8  2005/03/28 00:07:24  edink
+ *   Reshufle includes to make it compile on windows
+ *
  *   Revision 1.7  2005/03/26 03:13:58  sniper
  *   - Made it possible to build ext/xmlrpc with libxml2
  *
@@ -104,6 +107,7 @@
  *   there must be some.
  **/
  
+#include ext/xml/expat_compat.h
 #ifdef _WIN32
 #include xmlrpc_win32.h
 #endif
@@ -113,7 +117,6 @@
 
 #include xml_element.h
 #include queue.h
-#include ext/xml/expat_compat.h
 #include encodings.h
 
 #define my_free(thing)  if(thing) {free(thing); thing = 0;}
http://cvs.php.net/diff.php/php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c?r1=1.7r2=1.8ty=u
Index: php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.7 
php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.8
--- php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c:1.7   Fri Mar 25 22:13:58 2005
+++ php-src/ext/xmlrpc/libxmlrpc/xmlrpc.c   Sun Mar 27 19:07:24 2005
@@ -31,7 +31,7 @@
 */
 
 
-static const char rcsid[] = #(@) $Id: xmlrpc.c,v 1.7 2005/03/26 03:13:58 
sniper Exp $;
+static const char rcsid[] = #(@) $Id: xmlrpc.c,v 1.8 2005/03/28 00:07:24 
edink Exp $;
 
 
 /h* ABOUT/xmlrpc
@@ -43,6 +43,9 @@
  *   9/1999 - 10/2000
  * HISTORY
  *   $Log: xmlrpc.c,v $
+ *   Revision 1.8  2005/03/28 00:07:24  edink
+ *   Reshufle includes to make it compile on windows
+ *
  *   Revision 1.7  2005/03/26 03:13:58  sniper
  *   - Made it possible to build ext/xmlrpc with libxml2
  *
@@ -122,7 +125,7 @@
  * - comprehensive API for manipulation of values
  ***/
 
-
+#include ext/xml/expat_compat.h
 #ifdef _WIN32
 #include xmlrpc_win32.h
 #endif
@@ -135,7 +138,6 @@
 
 #include queue.h
 #include xmlrpc.h
-#include ext/xml/expat_compat.h
 #include base64.h
 
 #include xml_to_xmlrpc.h

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/xmlrpc/libxmlrpc xml_element.c

2004-06-01 Thread Ilia Alshanetsky 
iliaa   Tue Jun  1 16:16:07 2004 EDT

  Modified files:  
/php-src/ext/xmlrpc/libxmlrpc   xml_element.c 
  Log:
  Fixed bug #28597 (xmlrpc_encode_request() incorrectly encodes chars in 
  200-210 range).
  Patch by: fernando dot nemec at folha dot com dot br 
  
  
http://cvs.php.net/diff.php/php-src/ext/xmlrpc/libxmlrpc/xml_element.c?r1=1.5r2=1.6ty=u
Index: php-src/ext/xmlrpc/libxmlrpc/xml_element.c
diff -u php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.5 
php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.6
--- php-src/ext/xmlrpc/libxmlrpc/xml_element.c:1.5  Tue Dec 16 16:00:21 2003
+++ php-src/ext/xmlrpc/libxmlrpc/xml_element.c  Tue Jun  1 16:16:06 2004
@@ -31,7 +31,7 @@
 */
 
 
-static const char rcsid[] = #(@) $Id: xml_element.c,v 1.5 2003/12/16 21:00:21 sniper 
Exp $;
+static const char rcsid[] = #(@) $Id: xml_element.c,v 1.6 2004/06/01 20:16:06 iliaa 
Exp $;
 
 
 
@@ -44,6 +44,11 @@
  *   06/2000
  * HISTORY
  *   $Log: xml_element.c,v $
+ *   Revision 1.6  2004/06/01 20:16:06  iliaa
+ *   Fixed bug #28597 (xmlrpc_encode_request() incorrectly encodes chars in
+ *   200-210 range).
+ *   Patch by: fernando dot nemec at folha dot com dot br
+ *
  *   Revision 1.5  2003/12/16 21:00:21  sniper
  *   Fix some compile warnings (patch by Joe Orton)
  *
@@ -268,10 +273,9 @@
 pString[counter++] = c / 100 + '0';
 c = c % 100;
   }
-  if(c = 10) {
-pString[counter++] = c / 10 + '0';
-c = c % 10;
-  }
+  pString[counter++] = c / 10 + '0';
+  c = c % 10;
+
   pString[counter++] = c + '0';
   pString[counter++] = ';';
   return counter; 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php