diff options
author | Daniel Veillard <veillard@src.gnome.org> | 2001-04-02 15:16:19 +0000 |
---|---|---|
committer | Daniel Veillard <veillard@src.gnome.org> | 2001-04-02 15:16:19 +0000 |
commit | 4dd9346df228ff478e8cbe38bee270d56a609676 (patch) | |
tree | 802bbe57991803463411bc0795f72698de469ad4 /HTMLtree.c | |
parent | bc96766c0f406ab1b5a2eb3a4f9f9d203e110d0d (diff) | |
download | android_external_libxml2-4dd9346df228ff478e8cbe38bee270d56a609676.tar.gz android_external_libxml2-4dd9346df228ff478e8cbe38bee270d56a609676.tar.bz2 android_external_libxml2-4dd9346df228ff478e8cbe38bee270d56a609676.zip |
Small fixes: - xpath.c: fixed a memleak when comparing nodesets -
Small fixes:
- xpath.c: fixed a memleak when comparing nodesets
- HTMLtree.c: don't invent the HTML doctype if not available (XSLT)
- tree.c: added a TODO
Daniel
Diffstat (limited to 'HTMLtree.c')
-rw-r--r-- | HTMLtree.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -961,12 +961,15 @@ htmlDocContentDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr cur, const char *enco */ type = cur->type; cur->type = XML_HTML_DOCUMENT_NODE; - if (cur->intSubset != NULL) + if (cur->intSubset != NULL) { htmlDtdDumpOutput(buf, cur, NULL); - else { +#if 0 + /* Disabled for XSLT output */ + } else { /* Default to HTML-4.0 transitionnal @@@@ */ xmlOutputBufferWriteString(buf, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">\n"); +#endif } if (cur->children != NULL) { htmlNodeListDumpOutput(buf, cur, cur->children, encoding); @@ -975,7 +978,6 @@ htmlDocContentDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr cur, const char *enco cur->type = (xmlElementType) type; } - /************************************************************************ * * * Saving functions front-ends * @@ -1130,6 +1132,8 @@ htmlSaveFileEnc(const char *filename, xmlDocPtr cur, const char *encoding) { return(-1); htmlSetMetaEncoding(cur, (const xmlChar *) encoding); } + } else { + htmlSetMetaEncoding(cur, (const xmlChar *) "UTF-8"); } /* |