commit e5f33e56bafc332fd63f6643b687ebfe14bcba56
author Nick Wellnhofer <wellnhofer@aevum.de> Thu Nov 09 17:29:22 2017 +0100
committer Nick Wellnhofer <wellnhofer@aevum.de> Thu Nov 09 17:29:22 2017 +0100
tree 22d7e2e4e64c1b811cdb24c7b9b0dce5d4dee736
parent 4dd6d7a58e3694af7ed42589affcfa9a1550dada

Fix misc callback signatures

Fix parameter and return types for xmlC14NIsVisibleCallback and
xmlRegExecCallbacks.

c14n.c

diff --git a/c14n.c b/c14n.c
index b7cb7b0..a0f2c19 100644
--- a/c14n.c
+++ b/c14n.c
@@ -89,7 +89,7 @@
 								 xmlNsPtr ns,
 								 xmlC14NCtxPtr ctx);
 
-static int			xmlC14NIsNodeInNodeset		(xmlNodeSetPtr nodes,
+static int			xmlC14NIsNodeInNodeset		(void *user_data,
 								 xmlNodePtr node,
 								 xmlNodePtr parent);
 
@@ -252,7 +252,8 @@
 #define XML_NAMESPACES_DEFAULT		16
 
 static int
-xmlC14NIsNodeInNodeset(xmlNodeSetPtr nodes, xmlNodePtr node, xmlNodePtr parent) {
+xmlC14NIsNodeInNodeset(void *user_data, xmlNodePtr node, xmlNodePtr parent) {
+    xmlNodeSetPtr nodes = (xmlNodeSetPtr) user_data;
     if((nodes != NULL) && (node != NULL)) {
 	if(node->type != XML_NAMESPACE_DECL) {
 	    return(xmlXPathNodeSetContains(nodes, node));
@@ -1975,7 +1976,7 @@
                  int mode, xmlChar ** inclusive_ns_prefixes,
                  int with_comments, xmlOutputBufferPtr buf) {
     return(xmlC14NExecute(doc,
-			(xmlC14NIsVisibleCallback)xmlC14NIsNodeInNodeset,
+			xmlC14NIsNodeInNodeset,
 			nodes,
 			mode,
 			inclusive_ns_prefixes,