From 3033a270232aa1c56673a7a01c0548b7f1554fc2 Mon Sep 17 00:00:00 2001 From: "Frank M. Kromann" Date: Wed, 27 Nov 2002 04:07:02 +0000 Subject: [PATCH] MFH --- ext/rpc/xmlrpc/libxmlrpc/base64.c | 1 - ext/rpc/xmlrpc/libxmlrpc/encodings.c | 1 + ext/rpc/xmlrpc/libxmlrpc/xml_element.c | 4 +++- ext/rpc/xmlrpc/xmlrpc-epi-php.c | 2 +- ext/xmlrpc/libxmlrpc/base64.c | 1 - ext/xmlrpc/libxmlrpc/encodings.c | 1 + ext/xmlrpc/libxmlrpc/xml_element.c | 4 +++- ext/xmlrpc/xmlrpc-epi-php.c | 2 +- 8 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ext/rpc/xmlrpc/libxmlrpc/base64.c b/ext/rpc/xmlrpc/libxmlrpc/base64.c index 03c88a2b3c..6ae8b73c08 100644 --- a/ext/rpc/xmlrpc/libxmlrpc/base64.c +++ b/ext/rpc/xmlrpc/libxmlrpc/base64.c @@ -54,7 +54,6 @@ void base64_encode(struct buffer_st *b, const char *source, int length) int i, hiteof = 0; int offset = 0; int olen; - char *dest; olen = 0; diff --git a/ext/rpc/xmlrpc/libxmlrpc/encodings.c b/ext/rpc/xmlrpc/libxmlrpc/encodings.c index 2ea93f1832..8f7d33ea43 100644 --- a/ext/rpc/xmlrpc/libxmlrpc/encodings.c +++ b/ext/rpc/xmlrpc/libxmlrpc/encodings.c @@ -38,6 +38,7 @@ #include #else #include +#include #endif static const char rcsid[] = "#(@) $Id$"; diff --git a/ext/rpc/xmlrpc/libxmlrpc/xml_element.c b/ext/rpc/xmlrpc/libxmlrpc/xml_element.c index edbc6de346..3b2335c408 100644 --- a/ext/rpc/xmlrpc/libxmlrpc/xml_element.c +++ b/ext/rpc/xmlrpc/libxmlrpc/xml_element.c @@ -44,6 +44,9 @@ static const char rcsid[] = "#(@) $Id$"; * 06/2000 * HISTORY * $Log$ + * Revision 1.3 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 + * * Revision 1.9 2002/07/03 20:54:30 danda * root element should not have a parent. patch from anon SF user * @@ -558,7 +561,6 @@ typedef struct _xml_elem_data { /* expat start of element handler */ static void startElement(void *userData, const char *name, const char **attrs) { - int i; xml_element *c; xml_elem_data* mydata = (xml_elem_data*)userData; const char** p = attrs; diff --git a/ext/rpc/xmlrpc/xmlrpc-epi-php.c b/ext/rpc/xmlrpc/xmlrpc-epi-php.c index 8ffa8ce989..b814a0e9b4 100644 --- a/ext/rpc/xmlrpc/xmlrpc-epi-php.c +++ b/ext/rpc/xmlrpc/xmlrpc-epi-php.c @@ -1336,7 +1336,7 @@ int set_zval_xmlrpc_type(zval* value, XMLRPC_VALUE_TYPE newtype) XMLRPC_VALUE v = XMLRPC_CreateValueDateTime_ISO8601(NULL, value->value.str.val); if(v) { time_t timestamp = XMLRPC_GetValueDateTime(v); - if(time) { + if(timestamp) { pval* ztimestamp; MAKE_STD_ZVAL(ztimestamp); diff --git a/ext/xmlrpc/libxmlrpc/base64.c b/ext/xmlrpc/libxmlrpc/base64.c index 03c88a2b3c..6ae8b73c08 100644 --- a/ext/xmlrpc/libxmlrpc/base64.c +++ b/ext/xmlrpc/libxmlrpc/base64.c @@ -54,7 +54,6 @@ void base64_encode(struct buffer_st *b, const char *source, int length) int i, hiteof = 0; int offset = 0; int olen; - char *dest; olen = 0; diff --git a/ext/xmlrpc/libxmlrpc/encodings.c b/ext/xmlrpc/libxmlrpc/encodings.c index 2ea93f1832..8f7d33ea43 100644 --- a/ext/xmlrpc/libxmlrpc/encodings.c +++ b/ext/xmlrpc/libxmlrpc/encodings.c @@ -38,6 +38,7 @@ #include #else #include +#include #endif static const char rcsid[] = "#(@) $Id$"; diff --git a/ext/xmlrpc/libxmlrpc/xml_element.c b/ext/xmlrpc/libxmlrpc/xml_element.c index edbc6de346..3b2335c408 100644 --- a/ext/xmlrpc/libxmlrpc/xml_element.c +++ b/ext/xmlrpc/libxmlrpc/xml_element.c @@ -44,6 +44,9 @@ static const char rcsid[] = "#(@) $Id$"; * 06/2000 * HISTORY * $Log$ + * Revision 1.3 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 + * * Revision 1.9 2002/07/03 20:54:30 danda * root element should not have a parent. patch from anon SF user * @@ -558,7 +561,6 @@ typedef struct _xml_elem_data { /* expat start of element handler */ static void startElement(void *userData, const char *name, const char **attrs) { - int i; xml_element *c; xml_elem_data* mydata = (xml_elem_data*)userData; const char** p = attrs; diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 8ffa8ce989..b814a0e9b4 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -1336,7 +1336,7 @@ int set_zval_xmlrpc_type(zval* value, XMLRPC_VALUE_TYPE newtype) XMLRPC_VALUE v = XMLRPC_CreateValueDateTime_ISO8601(NULL, value->value.str.val); if(v) { time_t timestamp = XMLRPC_GetValueDateTime(v); - if(time) { + if(timestamp) { pval* ztimestamp; MAKE_STD_ZVAL(ztimestamp); -- 2.40.0