Spring cleanup ...: - configure.in Makefile.am config.h.in
Spring cleanup ...:
- configure.in Makefile.am config.h.in xmlversion.h.in: detect if
we need string functions
- trio.[ch] strio.[ch]: embedded the Trio-0.23 string functions
to be able to use them where needed. Applied some changes
to reduce name linking pollution and compile in only what's
needed.
- HTMLtree.c debugXML.c entities.c error.c nanoftp.c valid.c
xlink.c xmlversion.h.in xpath.c: got rid of the #ifdef
for the string manipulation functions
- xmlmemory.[ch]: removed DEBUG_MEMORY_FREED and added it automatically
to the free() function of xmlmemory.c
- entities.c HTMLtree.c parserInternals.c tree.c uri.c valid.c
xinclude.c xmlIO.c xpath.c xpointer.c: removed the MEM_CLEANUP
usage.
Daniel
diff --git a/tree.c b/tree.c
index 12cc9a4..1735258 100644
--- a/tree.c
+++ b/tree.c
@@ -213,7 +213,6 @@
}
if (cur->href != NULL) xmlFree((char *) cur->href);
if (cur->prefix != NULL) xmlFree((char *) cur->prefix);
- MEM_CLEANUP(cur, sizeof(xmlNs));
xmlFree(cur);
}
@@ -446,7 +445,6 @@
if (cur->pentities != NULL)
xmlFreeEntitiesTable((xmlEntitiesTablePtr) cur->pentities);
- MEM_CLEANUP(cur, sizeof(xmlDtd));
xmlFree(cur);
}
@@ -508,7 +506,6 @@
if (cur->ids != NULL) xmlFreeIDTable((xmlIDTablePtr) cur->ids);
if (cur->refs != NULL) xmlFreeRefTable((xmlRefTablePtr) cur->refs);
if (cur->URL != NULL) xmlFree((char *) cur->URL);
- MEM_CLEANUP(cur, sizeof(xmlDoc));
xmlFree(cur);
}
@@ -1133,7 +1130,6 @@
xmlRemoveID(cur->parent->doc, cur);
if (cur->name != NULL) xmlFree((char *) cur->name);
if (cur->children != NULL) xmlFreeNodeList(cur->children);
- MEM_CLEANUP(cur, sizeof(xmlAttr));
xmlFree(cur);
}
@@ -2329,7 +2325,6 @@
(cur->name != xmlStringComment))
xmlFree((char *) cur->name);
if (cur->nsDef != NULL) xmlFreeNsList(cur->nsDef);
- MEM_CLEANUP(cur, sizeof(xmlNode));
xmlFree(cur);
}
@@ -4511,14 +4506,8 @@
return;
}
if (buf->content != NULL) {
-#ifndef XML_USE_BUFFER_CONTENT
- MEM_CLEANUP(buf->content, BASE_BUFFER_SIZE);
-#else
- MEM_CLEANUP(buf->content, buf->size);
-#endif
xmlFree(buf->content);
}
- MEM_CLEANUP(buf, sizeof(xmlBuffer));
xmlFree(buf);
}
@@ -4532,7 +4521,7 @@
xmlBufferEmpty(xmlBufferPtr buf) {
if (buf->content == NULL) return;
buf->use = 0;
- MEM_CLEANUP(buf->content, buf->size);
+ memset(buf->content, 0, buf->size);
}
/**