Fix some libxml2 HEAD deprecations

Author: dwarring

src/dom.c

@@ -602,7 +602,7 @@ domTestDocument(xmlNodePtr cur, xmlNodePtr refNode) {
     return 1;
 }
 
-static void _domScanEntry(void* value, int* refs, xmlChar* key ATTRIBUTE_UNUSED) {
+static void _domScanEntry(void* value, int* refs, xmlChar*) {
     if (value != NULL && ((xmlNodePtr)value)->_private != NULL) {
         (*refs)++;
     }
@@ -1300,14 +1300,15 @@ domGetNodeValue( xmlNodePtr n ) {
                 /* ok then toString in this case ... */
                 while (cnode) {
                     xmlBufferPtr buffer = xmlBufferCreate();
-                    /* buffer = xmlBufferCreate(); */
+                    const xmlChar* content;
                     xmlNodeDump( buffer, n->doc, cnode, 0, 0 );
-                    if ( buffer->content != NULL ) {
+                    content = xmlBufferContent( buffer );
+                    if ( content != NULL ) {
                         if ( rv != NULL ) {
-                            rv = xmlStrcat( rv, buffer->content );
+                            rv = xmlStrcat( rv, content );
                         }
                         else {
-                            rv = xmlStrdup( buffer->content );
+                            rv = xmlBufferDetach( buffer );
                         }
                     }
                     xmlBufferFree( buffer );
@@ -1993,8 +1994,7 @@ domAttrSerializeContent(xmlAttrPtr attr) {
         children = children->next;
     }
 
-    rv = buffer->content;
-    buffer->content = NULL;
+    rv = xmlBufferDetach(buffer);
     xmlBufferFree( buffer );
 
     return rv;

src/domXPath.c

@@ -303,7 +303,7 @@ DLLEXPORT xmlNodeSetPtr domReverseNodeSet(xmlNodeSetPtr rv) {
 }
 
 static void
-_domNodeSetGC(void *entry, unsigned char *key ATTRIBUTE_UNUSED) {
+_domNodeSetGC(void *entry, unsigned char*) {
     xmlNodePtr twig = (xmlNodePtr) entry;
     xmlNodePtr owner = _domItemOwner(twig);
     if (owner) {

src/xml6_hash.c

@@ -22,15 +22,15 @@ static xmlChar* _xml6_make_ns_key(xmlChar* name, xmlChar *pfx) {
     return key;
 }
 
-static void _xml6_get_key(void* value ATTRIBUTE_UNUSED, const xmlChar*** keys, xmlChar* name, xmlChar* pfx, xmlChar* _ ATTRIBUTE_UNUSED ) {
+static void _xml6_get_key(void*, const xmlChar*** keys, xmlChar* name, xmlChar* pfx, xmlChar*) {
     *((*keys)++) = _xml6_make_ns_key(name, pfx);
 }
 
-static void _xml6_get_value(void* value, const void*** values, xmlChar* _ ATTRIBUTE_UNUSED, xmlChar* _2 ATTRIBUTE_UNUSED, xmlChar* _3 ATTRIBUTE_UNUSED) {
+static void _xml6_get_value(void* value, const void*** values, xmlChar*, xmlChar*, xmlChar*) {
     *((*values)++) = value;
 }
 
-static void _xml6_get_pair(void* value, const void*** pairs, xmlChar* name, xmlChar *pfx, xmlChar* _3 ATTRIBUTE_UNUSED) {
+static void _xml6_get_pair(void* value, const void*** pairs, xmlChar* name, xmlChar *pfx, xmlChar*) {
     *((*pairs)++) = (void*) _xml6_make_ns_key(name, pfx);
     *((*pairs)++) = value;
 }
@@ -232,7 +232,7 @@ DLLEXPORT void* xml6_hash_lookup_ns(xmlHashTablePtr self, xmlChar* name) {
 }
 
 // Free the hash, leave contents intact
-static void _keep_hash_contents(void *entry ATTRIBUTE_UNUSED, const xmlChar *name ATTRIBUTE_UNUSED) {
+static void _keep_hash_contents(void*, const xmlChar*) {
     // do nothing
 }
 DLLEXPORT void xml6_hash_discard(xmlHashTablePtr self) {

src/xml6_node.c

@@ -153,11 +153,10 @@ DLLEXPORT xmlChar* xml6_node_to_buf(xmlNodePtr self, int options, size_t* len, c
         xmlSaveClose(save_ctx);
 
         if (stat >= 0) {
-            rv = buffer->content;
-            buffer->content = NULL;
             if (len != NULL) {
-                *len = buffer->use;
+                *len = xmlBufferLength(buffer);
             }
+            rv = xmlBufferDetach(buffer);
         }
         xmlBufferFree(buffer);
     }