diff options
Diffstat (limited to 'ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c')
| -rw-r--r-- | ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c b/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c index c557ee06d8..309f0dce3d 100644 --- a/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c +++ b/ext/xmlrpc/libxmlrpc/xml_to_xmlrpc.c @@ -35,9 +35,6 @@ static const char rcsid[] = "#(@) $Id$"; #include "php.h" #include "main/snprintf.h" -#ifdef _WIN32 -#include "xmlrpc_win32.h" -#endif #include <string.h> #include <stdlib.h> #include "xml_to_xmlrpc.h" @@ -207,40 +204,40 @@ xml_element* XMLRPC_to_xml_element_worker(XMLRPC_VALUE current_vector, XMLRPC_VA if (next_el) { Q_PushTail(&elem_val->children, next_el); } - elem_val->name = strdup(bIsFault ? ELEM_FAULT : ELEM_PARAMS); + elem_val->name = estrdup(bIsFault ? ELEM_FAULT : ELEM_PARAMS); } else { switch (type) { case xmlrpc_empty: /* treat null value as empty string in xmlrpc. */ case xmlrpc_string: - elem_val->name = strdup(ELEM_STRING); + elem_val->name = estrdup(ELEM_STRING); simplestring_addn(&elem_val->text, XMLRPC_GetValueString(node), XMLRPC_GetValueStringLen(node)); break; case xmlrpc_int: - elem_val->name = strdup(ELEM_INT); + elem_val->name = estrdup(ELEM_INT); snprintf(buf, BUF_SIZE, "%i", XMLRPC_GetValueInt(node)); simplestring_add(&elem_val->text, buf); break; case xmlrpc_boolean: - elem_val->name = strdup(ELEM_BOOLEAN); + elem_val->name = estrdup(ELEM_BOOLEAN); snprintf(buf, BUF_SIZE, "%i", XMLRPC_GetValueBoolean(node)); simplestring_add(&elem_val->text, buf); break; case xmlrpc_double: { - elem_val->name = strdup(ELEM_DOUBLE); + elem_val->name = estrdup(ELEM_DOUBLE); ap_php_snprintf(buf, BUF_SIZE, "%.*G", (int) EG(precision), XMLRPC_GetValueDouble(node)); simplestring_add(&elem_val->text, buf); } break; case xmlrpc_datetime: - elem_val->name = strdup(ELEM_DATETIME); + elem_val->name = estrdup(ELEM_DATETIME); simplestring_add(&elem_val->text, XMLRPC_GetValueDateTime_ISO8601(node)); break; case xmlrpc_base64: { struct buffer_st buf; - elem_val->name = strdup(ELEM_BASE64); + elem_val->name = estrdup(ELEM_BASE64); base64_encode_xmlrpc(&buf, XMLRPC_GetValueBase64(node), XMLRPC_GetValueStringLen(node)); simplestring_addn(&elem_val->text, buf.data, buf.offset ); buffer_delete(&buf); @@ -256,7 +253,7 @@ xml_element* XMLRPC_to_xml_element_worker(XMLRPC_VALUE current_vector, XMLRPC_VA case xmlrpc_vector_array: { if(depth == 0) { - elem_val->name = strdup(ELEM_PARAMS); + elem_val->name = estrdup(ELEM_PARAMS); } else { /* Hi my name is Dave and I like to make things as confusing @@ -268,9 +265,9 @@ xml_element* XMLRPC_to_xml_element_worker(XMLRPC_VALUE current_vector, XMLRPC_VA * GRRRRRRRRR! */ xml_element* data = xml_elem_new(); - data->name = strdup(ELEM_DATA); + data->name = estrdup(ELEM_DATA); - elem_val->name = strdup(ELEM_ARRAY); + elem_val->name = estrdup(ELEM_ARRAY); Q_PushTail(&elem_val->children, data); root_vector_elem = data; } @@ -278,7 +275,7 @@ xml_element* XMLRPC_to_xml_element_worker(XMLRPC_VALUE current_vector, XMLRPC_VA break; case xmlrpc_vector_mixed: /* not officially supported */ case xmlrpc_vector_struct: - elem_val->name = strdup(ELEM_STRUCT); + elem_val->name = estrdup(ELEM_STRUCT); break; default: break; @@ -304,7 +301,7 @@ xml_element* XMLRPC_to_xml_element_worker(XMLRPC_VALUE current_vector, XMLRPC_VA if (depth == 1) { xml_element* value = xml_elem_new(); - value->name = strdup(ELEM_VALUE); + value->name = estrdup(ELEM_VALUE); /* yet another hack for the "fault" crap */ if (XMLRPC_VectorGetValueWithID(node, ELEM_FAULTCODE)) { @@ -312,7 +309,7 @@ xml_element* XMLRPC_to_xml_element_worker(XMLRPC_VALUE current_vector, XMLRPC_VA } else { xml_element* param = xml_elem_new(); - param->name = strdup(ELEM_PARAM); + param->name = estrdup(ELEM_PARAM); Q_PushTail(¶m->children, value); @@ -325,9 +322,9 @@ xml_element* XMLRPC_to_xml_element_worker(XMLRPC_VALUE current_vector, XMLRPC_VA xml_element* name = xml_elem_new(); xml_element* value = xml_elem_new(); - member->name = strdup(ELEM_MEMBER); - name->name = strdup(ELEM_NAME); - value->name = strdup(ELEM_VALUE); + member->name = estrdup(ELEM_MEMBER); + name->name = estrdup(ELEM_NAME); + value->name = estrdup(ELEM_VALUE); simplestring_add(&name->text, XMLRPC_GetValueID(node)); @@ -340,7 +337,7 @@ xml_element* XMLRPC_to_xml_element_worker(XMLRPC_VALUE current_vector, XMLRPC_VA else if (vtype == xmlrpc_vector_array) { xml_element* value = xml_elem_new(); - value->name = strdup(ELEM_VALUE); + value->name = estrdup(ELEM_VALUE); Q_PushTail(&value->children, elem_val); @@ -353,7 +350,7 @@ xml_element* XMLRPC_to_xml_element_worker(XMLRPC_VALUE current_vector, XMLRPC_VA else { xml_element* value = xml_elem_new(); - value->name = strdup(ELEM_VALUE); + value->name = estrdup(ELEM_VALUE); Q_PushTail(&value->children, elem_val); @@ -384,7 +381,7 @@ xml_element* XMLRPC_REQUEST_to_xml_element(XMLRPC_REQUEST request) { pStr = ELEM_METHODRESPONSE; } if (pStr) { - wrapper->name = strdup(pStr); + wrapper->name = estrdup(pStr); } if(request_type == xmlrpc_request_call) { @@ -392,7 +389,7 @@ xml_element* XMLRPC_REQUEST_to_xml_element(XMLRPC_REQUEST request) { if (pStr) { xml_element* method = xml_elem_new(); - method->name = strdup(ELEM_METHODNAME); + method->name = estrdup(ELEM_METHODNAME); simplestring_add(&method->text, pStr); Q_PushTail(&wrapper->children, method); } @@ -404,7 +401,7 @@ xml_element* XMLRPC_REQUEST_to_xml_element(XMLRPC_REQUEST request) { else { /* Despite the spec, the xml-rpc list folk want me to send an empty params element */ xml_element* params = xml_elem_new(); - params->name = strdup(ELEM_PARAMS); + params->name = estrdup(ELEM_PARAMS); Q_PushTail(&wrapper->children, params); } } |