diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | native/jni/xmlj/xmlj_io.c | 20 |
2 files changed, 24 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2012-08-09 Dodji Seketeli <dodji@redhat.com> + + Use accessor functions to manipulate xmlOutputBuffer + * native/jni/xmlj/xmlj_io.c (GET_XML_OUTPUT_BUFFER_CONTENT) + (GET_XML_OUTPUT_BUFFER_SIZE): New macros. + (xmljOutputWriteCallback): Use them. + 2012-08-09 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/util/TimeZone.java: diff --git a/native/jni/xmlj/xmlj_io.c b/native/jni/xmlj/xmlj_io.c index aa2964dc3..a55e48df8 100644 --- a/native/jni/xmlj/xmlj_io.c +++ b/native/jni/xmlj/xmlj_io.c @@ -102,6 +102,19 @@ xmljFreeOutputStreamContext (OutputStreamContext * outContext); xmlCharEncoding xmljDetectCharEncoding (JNIEnv * env, jbyteArray buffer); + +#ifdef LIBXML2_NEW_BUFFER +#define GET_XML_OUTPUT_BUFFER_CONTENT(buf) (gchar *) \ + (char *) xmlOutputBufferGetContent(buf) +#define GET_XML_OUTPUT_BUFFER_SIZE(buf) \ + xmlOutputBufferGetSize(buf) +#else +#define GET_XML_OUTPUT_BUFFER_CONTENT(buf) \ + (buf)->buffer->content +#define GET_XML_OUTPUT_BUFFER_SIZE(buf) \ + (buf)->buffer->use +#endif + int xmljOutputWriteCallback (void *context, const char *buffer, int len) { @@ -752,9 +765,10 @@ xmljLoadExternalEntity (const char *URL, const char *ID, inputStream->directory = NULL; inputStream->buf = inputBuffer; - inputStream->base = inputStream->buf->buffer->content; - inputStream->cur = inputStream->buf->buffer->content; - inputStream->end = &inputStream->base[inputStream->buf->buffer->use]; + inputStream->base = GET_XML_OUTPUT_BUFFER_CONTENT (inputStream->buf); + inputStream->cur = GET_XML_OUTPUT_BUFFER_CONTENT (inputStream->buf); + inputStream->end = + &inputStream->base[GET_XML_OUTPUT_BUFFER_SIZE (inputStream->buf)]; if ((ctxt->directory == NULL) && (inputStream->directory != NULL)) ctxt->directory = (char *) xmlStrdup ((const xmlChar *) inputStream->directory); |