fixing compilation and link option when configuring with --without-valid

* debugXML.c relaxng.c valid.c xinclude.c xmllint.c xmlreader.c:
  fixing compilation and link option when configuring with
  --without-valid should fix #135309
Daniel

1 files changed, 21 insertions, 16 deletions

diff --git a/valid.c b/valid.c
index 22e41e6f..d2774e70 100644
--- a/valid.c
+++ b/valid.c
@@ -105,23 +105,23 @@ xmlErrValid(xmlValidCtxtPtr ctxt, xmlParserErrors error,
                         msg);
 }
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 /**
- * xmlErrValidNodeNr:
+ * xmlErrValidNode:
  * @ctxt:  an XML validation parser context
  * @node:  the node raising the error
  * @error:  the error number
  * @str1:  extra informations
- * @int2:  extra informations
+ * @str2:  extra informations
  * @str3:  extra informations
  *
  * Handle a validation error, provide contextual informations
  */
 static void
-xmlErrValidNodeNr(xmlValidCtxtPtr ctxt,
+xmlErrValidNode(xmlValidCtxtPtr ctxt,
                 xmlNodePtr node, xmlParserErrors error,
                 const char *msg, const xmlChar * str1,
-                int int2, const xmlChar * str3)
+                const xmlChar * str2, const xmlChar * str3)
 {
     xmlStructuredErrorFunc schannel = NULL;
     xmlGenericErrorFunc channel = NULL;
@@ -136,25 +136,28 @@ xmlErrValidNodeNr(xmlValidCtxtPtr ctxt,
     __xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_VALID, error,
                     XML_ERR_ERROR, NULL, 0,
                     (const char *) str1,
-                    (const char *) str3,
-                    NULL, int2, 0, msg, str1, int2, str3);
+                    (const char *) str1,
+                    (const char *) str3, 0, 0, msg, str1, str2, str3);
 }
+#endif /* LIBXML_VALID_ENABLED or LIBXML_SCHEMAS_ENABLED */
+
+#ifdef LIBXML_VALID_ENABLED
 /**
- * xmlErrValidNode:
+ * xmlErrValidNodeNr:
  * @ctxt:  an XML validation parser context
  * @node:  the node raising the error
  * @error:  the error number
  * @str1:  extra informations
- * @str2:  extra informations
+ * @int2:  extra informations
  * @str3:  extra informations
  *
  * Handle a validation error, provide contextual informations
  */
 static void
-xmlErrValidNode(xmlValidCtxtPtr ctxt,
+xmlErrValidNodeNr(xmlValidCtxtPtr ctxt,
                 xmlNodePtr node, xmlParserErrors error,
                 const char *msg, const xmlChar * str1,
-                const xmlChar * str2, const xmlChar * str3)
+                int int2, const xmlChar * str3)
 {
     xmlStructuredErrorFunc schannel = NULL;
     xmlGenericErrorFunc channel = NULL;
@@ -169,9 +172,10 @@ xmlErrValidNode(xmlValidCtxtPtr ctxt,
     __xmlRaiseError(schannel, channel, data, pctxt, node, XML_FROM_VALID, error,
                     XML_ERR_ERROR, NULL, 0,
                     (const char *) str1,
-                    (const char *) str1,
-                    (const char *) str3, 0, 0, msg, str1, str2, str3);
+                    (const char *) str3,
+                    NULL, int2, 0, msg, str1, int2, str3);
 }
+
 /**
  * xmlErrValidWarning:
  * @ctxt:  an XML validation parser context
@@ -2722,7 +2726,8 @@ xmlWalkRemoveRef(const void *data, const void *user)
  * Do nothing, return 0. Used to create unordered lists.
  */
 static int
-xmlDummyCompare(const void *data0, const void *data1)
+xmlDummyCompare(const void *data0 ATTRIBUTE_UNUSED,
+                const void *data1 ATTRIBUTE_UNUSED)
 {
     return (0);
 }
@@ -3150,7 +3155,7 @@ xmlGetDtdNotationDesc(xmlDtdPtr dtd, const xmlChar *name) {
     return(xmlHashLookup(table, name));
 }
 
-#ifdef LIBXML_VALID_ENABLED
+#if defined(LIBXML_VALID_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
 /**
  * xmlValidateNotationUse:
  * @ctxt:  the validation context
@@ -3181,7 +3186,7 @@ xmlValidateNotationUse(xmlValidCtxtPtr ctxt, xmlDocPtr doc,
     }
     return(1);
 }
-#endif /* LIBXML_VALID_ENABLED */
+#endif /* LIBXML_VALID_ENABLED or LIBXML_SCHEMAS_ENABLED */
 
 /**
  * xmlIsMixedElement: