more include cleanups, export cleanly one html output + format function.
Thu Nov 1 15:29:31 CET 2001 Daniel Veillard <daniel@veillard.com>
* HTMLtree.c tree.c include/libxml/HTMLtree.h
include/libxml/tree.h include/libxml/xmlIO.h: more include
cleanups, export cleanly one html output + format function.
Thu Nov 1 14:12:12 CET 2001 Daniel Veillard <daniel@veillard.com>
* parser.c: removed initGenericErrorDefaultFunc call from
xmlInitParser() since it could destroy previous calls to
xsltSetGenericErrorFunc() effects
Daniel
diff --git a/ChangeLog b/ChangeLog
index 167fc71..537c735 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Thu Nov 1 15:29:31 CET 2001 Daniel Veillard <daniel@veillard.com>
+
+ * HTMLtree.c tree.c include/libxml/HTMLtree.h
+ include/libxml/tree.h include/libxml/xmlIO.h: more include
+ cleanups, export cleanly one html output + format function.
+
+Thu Nov 1 14:12:12 CET 2001 Daniel Veillard <daniel@veillard.com>
+
+ * parser.c: removed initGenericErrorDefaultFunc call from
+ xmlInitParser() since it could destroy previous calls to
+ xsltSetGenericErrorFunc() effects
+
Thu Nov 1 09:37:13 CET 2001 Daniel Veillard <daniel@veillard.com>
* debugXML.c include/libxml/debugXML.h: bool can be a reserved
diff --git a/HTMLtree.c b/HTMLtree.c
index cd9417c..cb5f308 100644
--- a/HTMLtree.c
+++ b/HTMLtree.c
@@ -295,9 +295,6 @@
* *
************************************************************************/
-void htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
- xmlNodePtr cur, const char *encoding, int format);
-
static void
htmlDocContentDump(xmlBufferPtr buf, xmlDocPtr cur, int format);
diff --git a/include/libxml/HTMLtree.h b/include/libxml/HTMLtree.h
index 036f4b3..06221d0 100644
--- a/include/libxml/HTMLtree.h
+++ b/include/libxml/HTMLtree.h
@@ -88,11 +88,18 @@
const char *encoding,
int format);
-/* This one is imported from xmlIO.h
+void htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf,
+ xmlDocPtr doc,
+ xmlNodePtr cur,
+ const char *encoding,
+ int format);
void htmlDocContentDumpOutput(xmlOutputBufferPtr buf,
xmlDocPtr cur,
const char *encoding);
- */
+void htmlDocContentDumpFormatOutput(xmlOutputBufferPtr buf,
+ xmlDocPtr cur,
+ const char *encoding,
+ int format);
#ifdef __cplusplus
}
#endif
diff --git a/include/libxml/tree.h b/include/libxml/tree.h
index 6195c71..0eb694d 100644
--- a/include/libxml/tree.h
+++ b/include/libxml/tree.h
@@ -32,6 +32,9 @@
typedef struct _xmlParserInputBuffer xmlParserInputBuffer;
typedef xmlParserInputBuffer *xmlParserInputBufferPtr;
+typedef struct _xmlOutputBuffer xmlOutputBuffer;
+typedef xmlOutputBuffer *xmlOutputBufferPtr;
+
/* parser.h */
typedef struct _xmlParserInput xmlParserInput;
typedef xmlParserInput *xmlParserInputPtr;
@@ -810,16 +813,19 @@
int level,
int format);
-/* These are exported from xmlIO.h
-
-int xmlSaveFileTo (xmlOutputBuffer *buf,
+int xmlSaveFileTo (xmlOutputBufferPtr buf,
xmlDocPtr cur,
const char *encoding);
-int xmlSaveFormatFileTo (xmlOutputBuffer *buf,
- xmlDocPtr cur,
- const char *encoding,
- int format);
- */
+int xmlSaveFormatFileTo (xmlOutputBufferPtr buf,
+ xmlDocPtr cur,
+ const char *encoding,
+ int format);
+void xmlNodeDumpOutput (xmlOutputBufferPtr buf,
+ xmlDocPtr doc,
+ xmlNodePtr cur,
+ int level,
+ int format,
+ const char *encoding);
int xmlSaveFormatFileEnc ( const char * filename,
xmlDocPtr cur,
diff --git a/include/libxml/xmlIO.h b/include/libxml/xmlIO.h
index 7fc43e0..bc3ee4e 100644
--- a/include/libxml/xmlIO.h
+++ b/include/libxml/xmlIO.h
@@ -58,8 +58,6 @@
int len);
typedef int (*xmlOutputCloseCallback) (void * context);
-typedef struct _xmlOutputBuffer xmlOutputBuffer;
-typedef xmlOutputBuffer *xmlOutputBufferPtr;
struct _xmlOutputBuffer {
void* context;
xmlOutputWriteCallback writecallback;
@@ -169,25 +167,6 @@
#endif
/*
- * This save function are part of tree.h and HTMLtree.h actually
- */
-int xmlSaveFileTo (xmlOutputBuffer *buf,
- xmlDocPtr cur,
- const char *encoding);
-int xmlSaveFormatFileTo (xmlOutputBuffer *buf,
- xmlDocPtr cur,
- const char *encoding,
- int format);
-void xmlNodeDumpOutput (xmlOutputBufferPtr buf,
- xmlDocPtr doc,
- xmlNodePtr cur,
- int level,
- int format,
- const char *encoding);
-void htmlDocContentDumpOutput(xmlOutputBufferPtr buf,
- xmlDocPtr cur,
- const char *encoding);
-/*
* A predefined entity loader disabling network accesses
*/
xmlParserInputPtr xmlNoNetExternalEntityLoader(const char *URL,
diff --git a/parser.c b/parser.c
index bae06dc..dde6d12 100644
--- a/parser.c
+++ b/parser.c
@@ -10237,7 +10237,6 @@
initGenericErrorDefaultFunc(NULL);
xmlInitThreads();
xmlInitMemory();
- initGenericErrorDefaultFunc(NULL);
xmlInitCharEncodingHandlers();
xmlInitializePredefinedEntities();
xmlDefaultSAXHandlerInit();
diff --git a/tree.c b/tree.c
index f41337b..14d5752 100644
--- a/tree.c
+++ b/tree.c
@@ -6374,7 +6374,7 @@
* returns: the number of byte written or -1 in case of failure.
*/
int
-xmlSaveFileTo(xmlOutputBuffer *buf, xmlDocPtr cur, const char *encoding) {
+xmlSaveFileTo(xmlOutputBufferPtr buf, xmlDocPtr cur, const char *encoding) {
int ret;
if (buf == NULL) return(0);
@@ -6395,7 +6395,7 @@
* returns: the number of byte written or -1 in case of failure.
*/
int
-xmlSaveFormatFileTo(xmlOutputBuffer *buf, xmlDocPtr cur, const char *encoding, int format) {
+xmlSaveFormatFileTo(xmlOutputBufferPtr buf, xmlDocPtr cur, const char *encoding, int format) {
int ret;
if (buf == NULL) return(0);