Insert space between pubid and sysid when both passed to
* xmlwriter.c: Insert space between pubid and sysid when both
passed to xmlTextWriterStartDTD and indenting not being used.
Remove no longer used Mem callbacks.
diff --git a/xmlwriter.c b/xmlwriter.c
index 5911347..37b7945 100644
--- a/xmlwriter.c
+++ b/xmlwriter.c
@@ -2855,8 +2855,11 @@
if (count < 0)
return -1;
sum += count;
- } else if (writer->indent) {
+ } else {
+ if (writer->indent)
count = xmlOutputBufferWriteString(writer->out, "\n ");
+ else
+ count = xmlOutputBufferWrite(writer->out, 1, " ");
if (count < 0)
return -1;
sum += count;
@@ -4288,40 +4291,6 @@
}
/**
- * xmlTextWriterWriteMemCallback:
- * @context: the xmlBufferPtr
- * @str: the data to write
- * @len: the length of the data
- *
- * Write callback for the xmlOutputBuffer with target xmlBuffer
- *
- * Returns -1, 0, 1
- */
-static int
-xmlTextWriterWriteMemCallback(void *context, const xmlChar * str, int len)
-{
- xmlBufferPtr buf = (xmlBufferPtr) context;
-
- xmlBufferAdd(buf, str, len);
-
- return len;
-}
-
-/**
- * xmlTextWriterCloseMemCallback:
- * @context: the xmlBufferPtr
- *
- * Close callback for the xmlOutputBuffer with target xmlBuffer
- *
- * Returns -1, 0, 1
- */
-static int
-xmlTextWriterCloseMemCallback(void *context ATTRIBUTE_UNUSED)
-{
- return 0;
-}
-
-/**
* xmlTextWriterWriteDocCallback:
* @context: the xmlBufferPtr
* @str: the data to write