xmlBufLength() is not exported by libxml2, use xmlBufUse() instead

lxml · Mar 29, 2013 · 3b66150 · 3b66150
1 parent 3cdcb4f
commit 3b66150
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -2,6 +2,22 @@
 lxml changelog
 ==============
 
+Under development
+=================
+
+Features added
+--------------
+
+Bugs fixed
+----------
+
+* Replace illegal usage of ``xmlBufLength()`` in libxml2 2.9.0 by
+  properly exported API function ``xmlBufUse()``.
+
+Other changes
+-------------
+
+
 3.1.1 (2013-03-29)
 ==================
 

diff --git a/src/lxml/includes/etree_defs.h b/src/lxml/includes/etree_defs.h
@@ -172,7 +172,7 @@
 #ifndef LIBXML2_NEW_BUFFER
    typedef xmlBuffer xmlBuf;
 #  define xmlBufContent(buf) xmlBufferContent(buf)
-#  define xmlBufLength(buf) xmlBufferLength(buf)
+#  define xmlBufUse(buf) xmlBufferLength(buf)
 #endif
 
 /* libexslt 1.1.25+ support EXSLT functions in XPath */

diff --git a/src/lxml/includes/tree.pxd b/src/lxml/includes/tree.pxd
@@ -364,7 +364,7 @@ cdef extern from "libxml/tree.h":
     cdef const_xmlChar* xmlBufferContent(xmlBuffer* buf) nogil
     cdef int xmlBufferLength(xmlBuffer* buf) nogil
     cdef const_xmlChar* xmlBufContent(xmlBuf* buf) nogil # new in libxml2 2.9
-    cdef size_t xmlBufLength(xmlBuf* buf) nogil # new in libxml2 2.9
+    cdef size_t xmlBufUse(xmlBuf* buf) nogil # new in libxml2 2.9
     cdef int xmlKeepBlanksDefault(int val) nogil
     cdef xmlChar* xmlNodeGetBase(xmlDoc* doc, xmlNode* node) nogil
     cdef void xmlNodeSetBase(xmlNode* node, const_xmlChar* uri) nogil

diff --git a/src/lxml/serializer.pxi b/src/lxml/serializer.pxi
@@ -134,10 +134,10 @@ cdef _tostring(_Element element, encoding, doctype, method,
     try:
         if encoding is _unicode:
             result = (<unsigned char*>tree.xmlBufContent(
-                c_result_buffer))[:tree.xmlBufLength(c_result_buffer)].decode('UTF-8')
+                c_result_buffer))[:tree.xmlBufUse(c_result_buffer)].decode('UTF-8')
         else:
             result = <bytes>(<unsigned char*>tree.xmlBufContent(
-                c_result_buffer))[:tree.xmlBufLength(c_result_buffer)]
+                c_result_buffer))[:tree.xmlBufUse(c_result_buffer)]
     finally:
         error_result = tree.xmlOutputBufferClose(c_buffer)
     if error_result < 0: