c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add a document to the xmlwriter structure and pass document when writing

Browse Source 
* xmlwriter.c: Add a document to the xmlwriter structure and
  pass document when writing attribute content for encoding support.
This commit is contained in:
Rob Richards 2006-08-16 22:48:51 +00:00
parent 417b74d0b1
commit 9db68f0c14
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,4 +1,9 @@
Mon Aug 16 01:15:12 CEST 2006 Rob Richards <rrichards@ctindustries.net>
Thu Aug 17 00:48:31 CEST 2006 Rob Richards <rrichards@ctindustries.net>
* xmlwriter.c: Add a document to the xmlwriter structure and
pass document when writing attribute content for encoding support.
Wed Aug 16 01:15:12 CEST 2006 Rob Richards <rrichards@ctindustries.net>
* HTMLtree.c xmlsave.c: Add linefeeds to error messages allowing
for consistant handling.

11
xmlwriter.c
View File

@ -91,6 +91,7 @@ struct _xmlTextWriter {
char qchar; /* character used for quoting attribute values */
xmlParserCtxtPtr ctxt;
int no_doc_free;
xmlDocPtr doc;
};
static void xmlFreeTextWriterStackEntry(xmlLinkPtr lk);
@ -215,6 +216,9 @@ xmlNewTextWriter(xmlOutputBufferPtr out)
"xmlNewTextWriter : out of memory!\n");
return NULL;
}
ret->doc = xmlNewDoc(NULL);
ret->no_doc_free = 0;
return ret;
@ -487,6 +491,9 @@ xmlFreeTextWriter(xmlTextWriterPtr writer)
xmlFreeParserCtxt(writer->ctxt);
}
if (writer->doc != NULL)
xmlFreeDoc(writer->doc);
if (writer->ichar != NULL)
xmlFree(writer->ichar);
xmlFree(writer);
@ -539,6 +546,8 @@ xmlTextWriterStartDocument(xmlTextWriterPtr writer, const char *version,
if (encoder != NULL) {
writer->out->conv = xmlBufferCreateSize(4000);
xmlCharEncOutFunc(encoder, writer->out->conv, NULL);
if ((writer->doc != NULL) && (writer->doc->encoding == NULL))
writer->doc->encoding = xmlStrdup((xmlChar *)writer->out->encoder->name);
} else
writer->out->conv = NULL;
@ -1425,7 +1434,7 @@ xmlTextWriterWriteString(xmlTextWriterPtr writer, const xmlChar * content)
break;
case XML_TEXTWRITER_ATTRIBUTE:
buf = NULL;
xmlAttrSerializeTxtContent(writer->out->buffer, NULL,
xmlAttrSerializeTxtContent(writer->out->buffer, writer->doc,
NULL, content);
break;
default: