test: xmlrpc-epi-php.patch - ignore whitespace while making diff

glen glen at pld-linux.org
Wed Jun 6 17:24:41 CEST 2007


Author: glen                         Date: Wed Jun  6 15:24:41 2007 GMT
Module: test                          Tag: HEAD
---- Log message:
- ignore whitespace while making diff

---- Files affected:
test:
   xmlrpc-epi-php.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: test/xmlrpc-epi-php.patch
diff -u test/xmlrpc-epi-php.patch:1.1 test/xmlrpc-epi-php.patch:1.2
--- test/xmlrpc-epi-php.patch:1.1	Wed Jun  6 17:23:03 2007
+++ test/xmlrpc-epi-php.patch	Wed Jun  6 17:24:36 2007
@@ -1,5 +1,5 @@
 Only in ext/xmlrpc/libxmlrpc/: acinclude.m4
-diff -ur ../xmlrpc-epi-0.51/src/base64.c ext/xmlrpc/libxmlrpc/base64.c
+diff -ur -w ../xmlrpc-epi-0.51/src/base64.c ext/xmlrpc/libxmlrpc/base64.c
 --- ../xmlrpc-epi-0.51/src/base64.c	2002-02-13 22:58:50.000000000 +0200
 +++ ext/xmlrpc/libxmlrpc/base64.c	2007-03-04 21:30:56.000000000 +0200
 @@ -1,4 +1,4 @@
@@ -55,7 +55,7 @@
  {
      int i;
      int offset = 0;
-diff -ur ../xmlrpc-epi-0.51/src/base64.h ext/xmlrpc/libxmlrpc/base64.h
+diff -ur -w ../xmlrpc-epi-0.51/src/base64.h ext/xmlrpc/libxmlrpc/base64.h
 --- ../xmlrpc-epi-0.51/src/base64.h	2001-03-20 05:28:35.000000000 +0200
 +++ ext/xmlrpc/libxmlrpc/base64.h	2007-03-04 21:30:56.000000000 +0200
 @@ -21,8 +21,8 @@
@@ -70,7 +70,7 @@
  /*
  #define DEBUG_MALLOC
 Only in ../xmlrpc-epi-0.51/src/: .cvsignore
-diff -ur ../xmlrpc-epi-0.51/src/encodings.c ext/xmlrpc/libxmlrpc/encodings.c
+diff -ur -w ../xmlrpc-epi-0.51/src/encodings.c ext/xmlrpc/libxmlrpc/encodings.c
 --- ../xmlrpc-epi-0.51/src/encodings.c	2002-03-12 20:08:18.000000000 +0200
 +++ ext/xmlrpc/libxmlrpc/encodings.c	2004-03-09 01:04:33.000000000 +0200
 @@ -30,23 +30,37 @@
@@ -127,7 +127,7 @@
                       int diff = out_ptr - outbuf;
 Only in ../xmlrpc-epi-0.51/src/: Makefile.am
 Only in ../xmlrpc-epi-0.51/src/: Makefile.in
-diff -ur ../xmlrpc-epi-0.51/src/queue.c ext/xmlrpc/libxmlrpc/queue.c
+diff -ur -w ../xmlrpc-epi-0.51/src/queue.c ext/xmlrpc/libxmlrpc/queue.c
 --- ../xmlrpc-epi-0.51/src/queue.c	2002-03-12 20:08:18.000000000 +0200
 +++ ext/xmlrpc/libxmlrpc/queue.c	2002-07-05 07:43:53.000000000 +0300
 @@ -1,4 +1,4 @@
@@ -147,7 +147,7 @@
  #include <stdlib.h>
  #include "queue.h"
  
-diff -ur ../xmlrpc-epi-0.51/src/queue.h ext/xmlrpc/libxmlrpc/queue.h
+diff -ur -w ../xmlrpc-epi-0.51/src/queue.h ext/xmlrpc/libxmlrpc/queue.h
 --- ../xmlrpc-epi-0.51/src/queue.h	2001-05-18 19:29:09.000000000 +0200
 +++ ext/xmlrpc/libxmlrpc/queue.h	2004-04-27 20:33:59.000000000 +0300
 @@ -76,8 +76,8 @@
@@ -161,7 +161,7 @@
  
  /* Fast (macro'd) versions of above */
  #define Q_Iter_Head_F(q) (q ? (q_iter)((queue*)q)->head : NULL)
-diff -ur ../xmlrpc-epi-0.51/src/simplestring.c ext/xmlrpc/libxmlrpc/simplestring.c
+diff -ur -w ../xmlrpc-epi-0.51/src/simplestring.c ext/xmlrpc/libxmlrpc/simplestring.c
 --- ../xmlrpc-epi-0.51/src/simplestring.c	2002-02-13 22:58:50.000000000 +0200
 +++ ext/xmlrpc/libxmlrpc/simplestring.c	2003-12-16 23:00:21.000000000 +0200
 @@ -31,10 +31,8 @@
@@ -180,8 +180,8 @@
   *   06/2000
   * HISTORY
   *   $Log$
-  *   Revision 1.1  2007/06/06 15:23:03  glen
-  *   - add
+  *   Revision 1.2  2007/06/06 15:24:36  glen
+  *   - ignore whitespace while making diff
   *
 + *   Revision 1.4  2003/12/16 21:00:21  sniper
 + *   Fix some compile warnings (patch by Joe Orton)
@@ -206,15 +206,15 @@
  
  #define my_free(thing)  if(thing) {free(thing); thing = 0;}
 Only in ../xmlrpc-epi-0.51/src/: .swp
-diff -ur ../xmlrpc-epi-0.51/src/system_methods.c ext/xmlrpc/libxmlrpc/system_methods.c
+diff -ur -w ../xmlrpc-epi-0.51/src/system_methods.c ext/xmlrpc/libxmlrpc/system_methods.c
 --- ../xmlrpc-epi-0.51/src/system_methods.c	2001-09-29 23:58:05.000000000 +0200
 +++ ext/xmlrpc/libxmlrpc/system_methods.c	2002-07-05 07:43:53.000000000 +0300
 @@ -36,6 +36,9 @@
   *   Dan Libby, aka danda  (dan at libby.com)
   * HISTORY
   *   $Log$
-  *   Revision 1.1  2007/06/06 15:23:03  glen
-  *   - add
+  *   Revision 1.2  2007/06/06 15:24:36  glen
+  *   - ignore whitespace while making diff
   *
 + *   Revision 1.2  2002/07/05 04:43:53  danda
 + *   merged in updates from SF project.  bring php repository up to date with xmlrpc-epi version 0.51
@@ -222,7 +222,7 @@
   *   Revision 1.7  2001/09/29 21:58:05  danda
   *   adding cvs log to history section
   *
-diff -ur ../xmlrpc-epi-0.51/src/xml_element.c ext/xmlrpc/libxmlrpc/xml_element.c
+diff -ur -w ../xmlrpc-epi-0.51/src/xml_element.c ext/xmlrpc/libxmlrpc/xml_element.c
 --- ../xmlrpc-epi-0.51/src/xml_element.c	2007-06-06 18:00:06.387783244 +0300
 +++ ext/xmlrpc/libxmlrpc/xml_element.c	2006-07-30 15:31:20.000000000 +0300
 @@ -31,7 +31,7 @@
@@ -238,8 +238,8 @@
   *   06/2000
   * HISTORY
   *   $Log$
-  *   Revision 1.1  2007/06/06 15:23:03  glen
-  *   - add
+  *   Revision 1.2  2007/06/06 15:24:36  glen
+  *   - ignore whitespace while making diff
   *
 + *   Revision 1.9.4.1  2006/07/30 11:34:02  tony2001
 + *   MFH: fix compile warnings (#38257)
@@ -321,11 +321,9 @@
      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 / 10 + '0';
-+  c = c % 10;
 +
    pString[counter++] = c + '0';
    pString[counter++] = ';';
@@ -431,7 +429,7 @@
  
        XML_ParserFree(parser);
 Only in ../xmlrpc-epi-0.51/src/: xml_element.c.~1~
-diff -ur ../xmlrpc-epi-0.51/src/xml_element.h ext/xmlrpc/libxmlrpc/xml_element.h
+diff -ur -w ../xmlrpc-epi-0.51/src/xml_element.h ext/xmlrpc/libxmlrpc/xml_element.h
 --- ../xmlrpc-epi-0.51/src/xml_element.h	2001-05-07 07:57:32.000000000 +0200
 +++ ext/xmlrpc/libxmlrpc/xml_element.h	2001-10-25 08:51:12.000000000 +0200
 @@ -158,7 +158,7 @@
@@ -443,7 +441,7 @@
  char* xml_elem_serialize_to_string(xml_element *el, XML_ELEM_OUTPUT_OPTIONS options, int *buf_len);
  void xml_elem_serialize_to_stream(xml_element *el, FILE *output, XML_ELEM_OUTPUT_OPTIONS options);
  xml_element* xml_elem_parse_buf(const char* in_buf, int len, XML_ELEM_INPUT_OPTIONS options, XML_ELEM_ERROR error);
-diff -ur ../xmlrpc-epi-0.51/src/xmlrpc.c ext/xmlrpc/libxmlrpc/xmlrpc.c
+diff -ur -w ../xmlrpc-epi-0.51/src/xmlrpc.c ext/xmlrpc/libxmlrpc/xmlrpc.c
 --- ../xmlrpc-epi-0.51/src/xmlrpc.c	2007-06-06 18:00:06.387783244 +0300
 +++ ext/xmlrpc/libxmlrpc/xmlrpc.c	2006-11-30 19:31:00.000000000 +0200
 @@ -31,8 +31,7 @@
@@ -460,8 +458,8 @@
   *   9/1999 - 10/2000
   * HISTORY
   *   $Log$
-  *   Revision 1.1  2007/06/06 15:23:03  glen
-  *   - add
+  *   Revision 1.2  2007/06/06 15:24:36  glen
+  *   - ignore whitespace while making diff
   *
 + *   Revision 1.8.4.1  2006/11/30 16:38:37  iliaa
 + *   last set of zts fixes
@@ -515,2082 +513,81 @@
  #include "base64.h"
  
  #include "xml_to_xmlrpc.h"
-@@ -146,9 +159,9 @@
- ***********************/
- 
- static int date_from_ISO8601 (const char *text, time_t * value) {
--	struct tm tm;
--	int n;
--	int i;
-+   struct tm tm;
-+   int n;
-+   int i;
- 	char buf[18];
- 
- 	if (strchr (text, '-')) {
-@@ -164,69 +177,69 @@
- 	}
- 
- 
--	tm.tm_isdst = -1;
-+   tm.tm_isdst = -1;
- 
--	if (strlen (text) < 17) {
--		return -1;
--	}
-+   if(strlen(text) < 17) {
-+      return -1;
-+   }
- 
--	n = 1000;
--	tm.tm_year = 0;
--	for (i = 0; i < 4; i++) {
--		tm.tm_year += (text[i] - '0') * n;
--		n /= 10;
--	}
--	n = 10;
--	tm.tm_mon = 0;
--	for (i = 0; i < 2; i++) {
--		tm.tm_mon += (text[i + 4] - '0') * n;
--		n /= 10;
--	}
--	tm.tm_mon--;
-+   n = 1000;
-+   tm.tm_year = 0;
-+   for(i = 0; i < 4; i++) {
-+      tm.tm_year += (text[i]-'0')*n;
-+      n /= 10;
-+   }
-+   n = 10;
-+   tm.tm_mon = 0;
-+   for(i = 0; i < 2; i++) {
-+      tm.tm_mon += (text[i+4]-'0')*n;
-+      n /= 10;
-+   }
-+   tm.tm_mon --;
- 
--	n = 10;
--	tm.tm_mday = 0;
--	for (i = 0; i < 2; i++) {
--		tm.tm_mday += (text[i + 6] - '0') * n;
--		n /= 10;
--	}
-+   n = 10;
-+   tm.tm_mday = 0;
-+   for(i = 0; i < 2; i++) {
-+      tm.tm_mday += (text[i+6]-'0')*n;
-+      n /= 10;
-+   }
- 
--	n = 10;
--	tm.tm_hour = 0;
--	for (i = 0; i < 2; i++) {
--		tm.tm_hour += (text[i + 9] - '0') * n;
--		n /= 10;
--	}
-+   n = 10;
-+   tm.tm_hour = 0;
-+   for(i = 0; i < 2; i++) {
-+      tm.tm_hour += (text[i+9]-'0')*n;
-+      n /= 10;
-+   }
- 
--	n = 10;
--	tm.tm_min = 0;
--	for (i = 0; i < 2; i++) {
--		tm.tm_min += (text[i + 12] - '0') * n;
--		n /= 10;
--	}
-+   n = 10;
-+   tm.tm_min = 0;
-+   for(i = 0; i < 2; i++) {
-+      tm.tm_min += (text[i+12]-'0')*n;
-+      n /= 10;
-+   }
- 
--	n = 10;
--	tm.tm_sec = 0;
--	for (i = 0; i < 2; i++) {
--		tm.tm_sec += (text[i + 15] - '0') * n;
--		n /= 10;
--	}
-+   n = 10;
-+   tm.tm_sec = 0;
-+   for(i = 0; i < 2; i++) {
-+      tm.tm_sec += (text[i+15]-'0')*n;
-+      n /= 10;
-+   }
- 
--	tm.tm_year -= 1900;
-+   tm.tm_year -= 1900;
- 
--	*value = mktime (&tm);
-+   *value = mktime(&tm);
- 
--	return 0;
-+   return 0;
- 
- }
- 
- static int date_to_ISO8601 (time_t value, char *buf, int length) {
--	struct tm *tm;
--	tm = localtime (&value);
--#if 0  // TODO: soap seems to favor this method. xmlrpc the latter.
-+   struct tm *tm, tmbuf;
-+   tm = php_localtime_r(&value, &tmbuf);
-+#if 0  /* TODO: soap seems to favor this method. xmlrpc the latter. */
- 	return strftime (buf, length, "%Y-%m-%dT%H:%M:%SZ", tm);
- #else
--	return strftime (buf, length, "%Y%m%dT%H:%M:%S", tm);
-+   return strftime(buf, length, "%Y%m%dT%H:%M:%S", tm);
- #endif
- }
- 
-@@ -252,12 +265,12 @@
-  *   XMLRPC_RequestFree ()
-  * SOURCE
-  */
--XMLRPC_REQUEST XMLRPC_RequestNew () {
--	XMLRPC_REQUEST xRequest = calloc (1, sizeof (STRUCT_XMLRPC_REQUEST));
--	if (xRequest) {
--		simplestring_init (&xRequest->methodName);
--	}
--	return xRequest;
-+XMLRPC_REQUEST XMLRPC_RequestNew() {
-+   XMLRPC_REQUEST xRequest = calloc(1, sizeof(STRUCT_XMLRPC_REQUEST));
-+   if(xRequest) {
-+      simplestring_init(&xRequest->methodName);
-+   }
-+   return xRequest;
- }
- 
- /*******/
-@@ -277,18 +290,18 @@
-  *   XMLRPC_CleanupValue ()
-  * SOURCE
-  */
--void XMLRPC_RequestFree (XMLRPC_REQUEST request, int bFreeIO) {
--	if (request) {
--		simplestring_free (&request->methodName);
--
--		if (request->io && bFreeIO) {
--			XMLRPC_CleanupValue (request->io);
--		}
--		if (request->error) {
--			XMLRPC_CleanupValue (request->error);
--		}
--		my_free (request);
--	}
-+void XMLRPC_RequestFree(XMLRPC_REQUEST request, int bFreeIO) {
-+   if(request) {
-+      simplestring_free(&request->methodName);
-+
-+      if(request->io && bFreeIO) {
-+         XMLRPC_CleanupValue(request->io);
-+      }
-+      if(request->error) {
-+         XMLRPC_CleanupValue(request->error);
-+      }
-+      my_free(request);
-+   }
- }
- 
- /*******/
-@@ -310,13 +323,13 @@
-  *   XMLRPC_RequestFree ()
-  * SOURCE
-  */
--const char *XMLRPC_RequestSetMethodName (XMLRPC_REQUEST request, const char *methodName) {
--	if (request) {
--		simplestring_clear (&request->methodName);
--		simplestring_add (&request->methodName, methodName);
--		return request->methodName.str;
--	}
--	return NULL;
-+const char* XMLRPC_RequestSetMethodName(XMLRPC_REQUEST request, const char* methodName) {
-+   if(request) {
-+      simplestring_clear(&request->methodName);
-+      simplestring_add(&request->methodName, methodName);
-+      return request->methodName.str;
-+   }
-+   return NULL;
- }
- 
- /*******/
-@@ -336,8 +349,8 @@
-  *   XMLRPC_RequestFree ()
-  * SOURCE
-  */
--const char *XMLRPC_RequestGetMethodName (XMLRPC_REQUEST request) {
--	return request ? request->methodName.str : NULL;
-+const char* XMLRPC_RequestGetMethodName(XMLRPC_REQUEST request) {
-+   return request ? request->methodName.str : NULL;
- }
- 
- /*******/
-@@ -363,11 +376,11 @@
-  */
- XMLRPC_REQUEST_TYPE XMLRPC_RequestSetRequestType (XMLRPC_REQUEST request,
- 																  XMLRPC_REQUEST_TYPE type) {
--	if (request) {
--		request->request_type = type;
--		return request->request_type;
--	}
--	return xmlrpc_request_none;
-+   if(request) {
-+      request->request_type = type;
-+      return request->request_type;
-+   }
-+   return xmlrpc_request_none;
- }
- 
- /*******/
-@@ -392,8 +405,8 @@
-  *   XMLRPC_REQUEST_TYPE
-  * SOURCE
-  */
--XMLRPC_REQUEST_TYPE XMLRPC_RequestGetRequestType (XMLRPC_REQUEST request) {
--	return request ? request->request_type : xmlrpc_request_none;
-+XMLRPC_REQUEST_TYPE XMLRPC_RequestGetRequestType(XMLRPC_REQUEST request) {
-+   return request ? request->request_type : xmlrpc_request_none;
- }
- 
- /*******/
-@@ -422,15 +435,15 @@
-  *   XMLRPC_VALUE
-  * SOURCE
-  */
--XMLRPC_VALUE XMLRPC_RequestSetData (XMLRPC_REQUEST request, XMLRPC_VALUE data) {
--	if (request && data) {
-+XMLRPC_VALUE XMLRPC_RequestSetData(XMLRPC_REQUEST request, XMLRPC_VALUE data) {
-+   if(request && data) {
- 		if (request->io) {
- 			XMLRPC_CleanupValue (request->io);
- 		}
--		request->io = XMLRPC_CopyValue (data);
--		return request->io;
--	}
--	return NULL;
-+      request->io = XMLRPC_CopyValue(data);
-+      return request->io;
-+   }
-+   return NULL;
- }
- 
- /*******/
-@@ -454,8 +467,8 @@
-  *   XMLRPC_VALUE
-  * SOURCE
-  */
--XMLRPC_VALUE XMLRPC_RequestGetData (XMLRPC_REQUEST request) {
--	return request ? request->io : NULL;
-+XMLRPC_VALUE XMLRPC_RequestGetData(XMLRPC_REQUEST request) {
-+   return request ? request->io : NULL;
- }
- 
- /*******/
-@@ -538,13 +551,13 @@
-  *   XMLRPC_REQUEST_OUTPUT_OPTIONS
-  * SOURCE
-  */
--XMLRPC_REQUEST_OUTPUT_OPTIONS XMLRPC_RequestSetOutputOptions (XMLRPC_REQUEST request, XMLRPC_REQUEST_OUTPUT_OPTIONS output) {
--	if (request && output) {
-+XMLRPC_REQUEST_OUTPUT_OPTIONS XMLRPC_RequestSetOutputOptions(XMLRPC_REQUEST request, XMLRPC_REQUEST_OUTPUT_OPTIONS output) {
-+   if(request && output) {
- 		memcpy (&request->output, output,
- 				  sizeof (STRUCT_XMLRPC_REQUEST_OUTPUT_OPTIONS));
--		return &request->output;
--	}
--	return NULL;
-+      return &request->output;
-+   }
-+   return NULL;
- }
- 
- /*******/
-@@ -569,8 +582,8 @@
-  *   XMLRPC_REQUEST_OUTPUT_OPTIONS
-  * SOURCE
-  */
--XMLRPC_REQUEST_OUTPUT_OPTIONS XMLRPC_RequestGetOutputOptions (XMLRPC_REQUEST request) {
--	return request ? &request->output : NULL;
-+XMLRPC_REQUEST_OUTPUT_OPTIONS XMLRPC_RequestGetOutputOptions(XMLRPC_REQUEST request) {
-+   return request ? &request->output : NULL;
- }
- 
- /*******/
-@@ -605,15 +618,15 @@
-  *   XMLRPC_VALUE
-  * SOURCE
-  */
--char *XMLRPC_VALUE_ToXML (XMLRPC_VALUE val, int *buf_len) {
--	xml_element *root_elem = XMLRPC_VALUE_to_xml_element (val);
--	char *pRet = NULL;
--
--	if (root_elem) {
--		pRet = xml_elem_serialize_to_string (root_elem, NULL, buf_len);
--		xml_elem_free (root_elem);
--	}
--	return pRet;
-+char* XMLRPC_VALUE_ToXML(XMLRPC_VALUE val, int* buf_len) {
-+   xml_element *root_elem = XMLRPC_VALUE_to_xml_element(val);
-+   char* pRet = NULL;
-+
-+   if(root_elem) {
-+      pRet = xml_elem_serialize_to_string(root_elem, NULL, buf_len);
-+      xml_elem_free(root_elem);
-+   }
-+   return pRet;
- }
- 
- /*******/
-@@ -639,8 +652,8 @@
-  *   XMLRPC_REQUEST
-  * SOURCE
-  */
--char *XMLRPC_REQUEST_ToXML (XMLRPC_REQUEST request, int *buf_len) {
--	char *pRet = NULL;
-+char* XMLRPC_REQUEST_ToXML(XMLRPC_REQUEST request, int* buf_len) {
-+      char* pRet = NULL;
- 	if (request) {
- 		xml_element *root_elem = NULL;
- 		if (request->output.version == xmlrpc_version_simple) {
-@@ -654,14 +667,14 @@
- 			root_elem = SOAP_REQUEST_to_xml_element (request);
- 		}
- 
--		if (root_elem) {
-+      if(root_elem) {
- 			pRet =
- 			xml_elem_serialize_to_string (root_elem,
- 													&request->output.xml_elem_opts,
- 													buf_len);
--			xml_elem_free (root_elem);
--		}
--	}
-+         xml_elem_free(root_elem);
-+      }
-+   }
- 	return pRet;
- }
- 
-@@ -688,43 +701,43 @@
-  * SOURCE
-  */
- XMLRPC_VALUE XMLRPC_VALUE_FromXML (const char *in_buf, int len, XMLRPC_REQUEST_INPUT_OPTIONS in_options) {
--	XMLRPC_VALUE xResponse = NULL;
--	XMLRPC_REQUEST req = XMLRPC_REQUEST_FromXML (in_buf, len, in_options);
-+   XMLRPC_VALUE xResponse = NULL;
-+   XMLRPC_REQUEST req = XMLRPC_REQUEST_FromXML(in_buf, len, in_options);
- 
--	if (req) {
--		xResponse = req->io;
--		XMLRPC_RequestFree (req, 0);
--	}
--	return xResponse;
-+   if(req) {
-+      xResponse = req->io;
-+      XMLRPC_RequestFree(req, 0);
-+   }
-+   return xResponse;
- }
- 
- /*******/
- 
- /* map parser errors to standard xml-rpc errors */
--static XMLRPC_VALUE map_expat_errors (XML_ELEM_ERROR error) {
--	XMLRPC_VALUE xReturn = NULL;
--	if (error) {
--		XMLRPC_ERROR_CODE code;
--		char buf[1024];
--		snprintf (buf, sizeof (buf),
--					 "error occurred at line %i, column %i, byte index %i",
-+static XMLRPC_VALUE map_expat_errors(XML_ELEM_ERROR error) {
-+   XMLRPC_VALUE xReturn = NULL;
-+   if(error) {
-+      XMLRPC_ERROR_CODE code;
-+      char buf[1024];
-+      snprintf(buf, sizeof(buf), 
-+               "error occurred at line %ld, column %ld, byte index %ld", 
- 					 error->line, error->column, error->byte_index);
- 
--		/* expat specific errors */
--		switch (error->parser_code) {
--		case XML_ERROR_UNKNOWN_ENCODING:
--			code = xmlrpc_error_parse_unknown_encoding;
--			break;
--		case XML_ERROR_INCORRECT_ENCODING:
--			code = xmlrpc_error_parse_bad_encoding;
--			break;
--		default:
--			code = xmlrpc_error_parse_xml_syntax;
--			break;
--		}
--		xReturn = XMLRPC_UtilityCreateFault (code, buf);
--	}
--	return xReturn;
-+      /* expat specific errors */
-+      switch(error->parser_code) {
-+      case XML_ERROR_UNKNOWN_ENCODING:
-+         code = xmlrpc_error_parse_unknown_encoding;
-+         break;
-+      case XML_ERROR_INCORRECT_ENCODING:
-+         code = xmlrpc_error_parse_bad_encoding;
-+         break;
-+      default:
-+         code = xmlrpc_error_parse_xml_syntax;
-+         break;
-+      }
-+      xReturn = XMLRPC_UtilityCreateFault(code, buf);
-+   }
-+   return xReturn;
- }
- 
- /****f* SERIALIZE/XMLRPC_REQUEST_FromXML
-@@ -748,38 +761,38 @@
-  */
- XMLRPC_REQUEST XMLRPC_REQUEST_FromXML (const char *in_buf, int len, 
- 													XMLRPC_REQUEST_INPUT_OPTIONS in_options) {
--	XMLRPC_REQUEST request = XMLRPC_RequestNew ();
--	STRUCT_XML_ELEM_ERROR error = { 0};
-+   XMLRPC_REQUEST request = XMLRPC_RequestNew();
-+   STRUCT_XML_ELEM_ERROR error = {0};
- 
--	if (request) {
-+   if(request) {
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/test/xmlrpc-epi-php.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list