summaryrefslogtreecommitdiff
path: root/ext/xmlrpc/libxmlrpc/xml_element.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/xmlrpc/libxmlrpc/xml_element.c')
-rw-r--r--ext/xmlrpc/libxmlrpc/xml_element.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/ext/xmlrpc/libxmlrpc/xml_element.c b/ext/xmlrpc/libxmlrpc/xml_element.c
index 6fc6bd3977..aa539efca5 100644
--- a/ext/xmlrpc/libxmlrpc/xml_element.c
+++ b/ext/xmlrpc/libxmlrpc/xml_element.c
@@ -130,7 +130,7 @@ static const char rcsid[] = "#(@) $Id$";
#include "queue.h"
#include "encodings.h"
-#define my_free(thing) if(thing) {free(thing); thing = NULL;}
+#define my_free(thing) if(thing) {efree(thing); thing = NULL;}
#define XML_DECL_START "<?xml"
#define XML_DECL_START_LEN sizeof(XML_DECL_START) - 1
@@ -207,7 +207,7 @@ void xml_elem_free_non_recurse(xml_element* root) {
Q_Destroy(&root->children);
Q_Destroy(&root->attrs);
if(root->name) {
- free((char *)root->name);
+ efree((char *)root->name);
root->name = NULL;
}
simplestring_free(&root->text);
@@ -263,7 +263,7 @@ void xml_elem_free(xml_element* root) {
* SOURCE
*/
xml_element* xml_elem_new() {
- xml_element* elem = calloc(1, sizeof(xml_element));
+ xml_element* elem = ecalloc(1, sizeof(xml_element));
if(elem) {
Q_Init(&elem->children);
Q_Init(&elem->attrs);
@@ -347,7 +347,7 @@ static char* xml_elem_entity_escape(const char* buf, int old_len, int *newlen, X
if(ToBeXmlEscaped) {
- NewBuffer= malloc(iLength+1);
+ NewBuffer= emalloc(iLength+1);
if(NewBuffer) {
bufcopy=buf;
while(*bufcopy) {
@@ -602,15 +602,15 @@ static void _xmlrpc_startElement(void *userData, const char *name, const char **
c = mydata->current;
mydata->current = xml_elem_new();
- mydata->current->name = (char*)strdup(name);
+ mydata->current->name = (char*)estrdup(name);
mydata->current->parent = c;
/* init attrs */
while(p && *p) {
- xml_element_attr* attr = malloc(sizeof(xml_element_attr));
+ xml_element_attr* attr = emalloc(sizeof(xml_element_attr));
if(attr) {
- attr->key = strdup(*p);
- attr->val = strdup(*(p+1));
+ attr->key = estrdup(*p);
+ attr->val = estrdup(*(p+1));
Q_PushTail(&mydata->current->attrs, attr);
p += 2;
@@ -646,7 +646,7 @@ static void _xmlrpc_charHandler(void *userData,
if(add_text) {
len = new_len;
simplestring_addn(&mydata->current->text, add_text, len);
- free(add_text);
+ efree(add_text);
return;
}
}