Commit 5a37bde3 authored by CET 2001 Daniel Veillard's avatar CET 2001 Daniel Veillard Committed by Daniel Veillard
Browse files

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
parent ebd38c5f
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
......
......@@ -295,9 +295,6 @@ found_meta:
* *
************************************************************************/
void htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf, xmlDocPtr doc,
xmlNodePtr cur, const char *encoding, int format);
static void
htmlDocContentDump(xmlBufferPtr buf, xmlDocPtr cur, int format);
......
......@@ -88,11 +88,18 @@ int htmlSaveFileFormat (const char *filename,
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
......
......@@ -32,6 +32,9 @@ extern "C" {
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 @@ void xmlNodeDump (xmlBufferPtr buf,
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 (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 xmlSaveFormatFileTo (xmlOutputBuffer *buf,
xmlDocPtr cur,
const char *encoding,
int format);
*/
int xmlSaveFormatFileEnc ( const char * filename,
xmlDocPtr cur,
......
......@@ -58,8 +58,6 @@ typedef int (*xmlOutputWriteCallback) (void * context, const char * buffer,
int len);
typedef int (*xmlOutputCloseCallback) (void * context);
typedef struct _xmlOutputBuffer xmlOutputBuffer;
typedef xmlOutputBuffer *xmlOutputBufferPtr;
struct _xmlOutputBuffer {
void* context;
xmlOutputWriteCallback writecallback;
......@@ -168,25 +166,6 @@ void * xmlIOHTTPOpenW (const char * post_uri,
void xmlRegisterHTTPPostCallbacks (void );
#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
*/
......
......@@ -10237,7 +10237,6 @@ xmlInitParser(void) {
initGenericErrorDefaultFunc(NULL);
xmlInitThreads();
xmlInitMemory();
initGenericErrorDefaultFunc(NULL);
xmlInitCharEncodingHandlers();
xmlInitializePredefinedEntities();
xmlDefaultSAXHandlerInit();
......
......@@ -6374,7 +6374,7 @@ xmlDocDump(FILE *f, xmlDocPtr cur) {
* 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 @@ xmlSaveFileTo(xmlOutputBuffer *buf, xmlDocPtr cur, const char *encoding) {
* 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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment