diff --git a/ChangeLog b/ChangeLog
index 62cbe500..bfbac899 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Feb  3 15:59:37 CET 2000 Daniel Veillard <Daniel.Veillard@w3.org>
+
+	* nanoftp.c nanohttp.c tree.c HTMLtree.[ch] debugXML.c xpath.c: Fixed
+	  compilation warnings on various platforms.
+	* parser.c: Fixed #5281 validity error callbacks are now desactived
+	  by default if not validating.
+
 Thu Feb  3 13:46:14 CET 2000 Daniel Veillard <Daniel.Veillard@w3.org>
 
 	* nanoftp.c, win32config.h.in: patches to compile on WIN32
diff --git a/HTMLtree.c b/HTMLtree.c
index 84271c4c..19bee532 100644
--- a/HTMLtree.c
+++ b/HTMLtree.c
@@ -265,6 +265,25 @@ htmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur) {
     }
 }
 
+/**
+ * htmlNodeDumpFile:
+ * @out:  the FILE pointer
+ * @doc:  the document
+ * @cur:  the current node
+ *
+ * Dump an HTML node, recursive behaviour,children are printed too.
+ */
+void
+htmlNodeDumpFile(FILE *out, xmlDocPtr doc, xmlNodePtr cur) {
+    xmlBufferPtr buf;
+
+    buf = xmlBufferCreate();
+    if (buf == NULL) return;
+    htmlNodeDump(buf, doc, cur);
+    xmlBufferDump(out, buf);
+    xmlBufferFree(buf);
+}
+
 /**
  * htmlDocContentDump:
  * @buf:  the HTML buffer output
diff --git a/HTMLtree.h b/HTMLtree.h
index 5a92dbf7..2b375e56 100644
--- a/HTMLtree.h
+++ b/HTMLtree.h
@@ -25,6 +25,8 @@ extern "C" {
 void htmlDocDumpMemory(xmlDocPtr cur, xmlChar**mem, int *size);
 void htmlDocDump(FILE *f, xmlDocPtr cur);
 int htmlSaveFile(const char *filename, xmlDocPtr cur);
+void htmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur);
+void htmlNodeDumpFile(FILE *out, xmlDocPtr doc, xmlNodePtr cur);
 
 #ifdef __cplusplus
 }
diff --git a/debugXML.c b/debugXML.c
index b91fe53e..802f45e2 100644
--- a/debugXML.c
+++ b/debugXML.c
@@ -16,6 +16,9 @@
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #include "xmlmemory.h"
 #include "tree.h"
 #include "parser.h"
@@ -677,7 +680,7 @@ xmlShellCat(xmlShellCtxtPtr ctxt, char *arg, xmlNodePtr node,
 	if (node->type == XML_HTML_DOCUMENT_NODE)
 	    htmlDocDump(stdout, (htmlDocPtr) node);
 	else
-	    htmlNodeDump(stdout, ctxt->doc, node);
+	    htmlNodeDumpFile(stdout, ctxt->doc, node);
     } else {
 	if (node->type == XML_DOCUMENT_NODE)
 	    xmlDocDump(stdout, (xmlDocPtr) node);
diff --git a/include/libxml/HTMLtree.h b/include/libxml/HTMLtree.h
index 5a92dbf7..2b375e56 100644
--- a/include/libxml/HTMLtree.h
+++ b/include/libxml/HTMLtree.h
@@ -25,6 +25,8 @@ extern "C" {
 void htmlDocDumpMemory(xmlDocPtr cur, xmlChar**mem, int *size);
 void htmlDocDump(FILE *f, xmlDocPtr cur);
 int htmlSaveFile(const char *filename, xmlDocPtr cur);
+void htmlNodeDump(xmlBufferPtr buf, xmlDocPtr doc, xmlNodePtr cur);
+void htmlNodeDumpFile(FILE *out, xmlDocPtr doc, xmlNodePtr cur);
 
 #ifdef __cplusplus
 }
diff --git a/nanoftp.c b/nanoftp.c
index ec363e13..4fa38852 100644
--- a/nanoftp.c
+++ b/nanoftp.c
@@ -56,6 +56,9 @@
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 #include "xmlmemory.h"
 #include "nanoftp.h"
@@ -1039,7 +1042,7 @@ xmlNanoFTPConnect(void *ctx) {
     res = xmlNanoFTPGetResponse(ctxt);
     switch (res) {
 	case 2:
-	    return(0);
+	    break;
 	case 3:
 	    fprintf(stderr, "FTP server asking for ACCNT on anonymous\n");
 	case 1:
diff --git a/nanohttp.c b/nanohttp.c
index f3e4827d..b8cb24ed 100644
--- a/nanohttp.c
+++ b/nanohttp.c
@@ -55,6 +55,9 @@
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 #include "xmlmemory.h"
 #include "nanohttp.h"
diff --git a/parser.c b/parser.c
index 8bfef833..a918cd94 100644
--- a/parser.c
+++ b/parser.c
@@ -685,8 +685,13 @@ xmlInitParserCtxt(xmlParserCtxtPtr ctxt)
     ctxt->valid = 1;
     ctxt->validate = xmlDoValidityCheckingDefaultValue;
     ctxt->vctxt.userData = ctxt;
-    ctxt->vctxt.error = xmlParserValidityError;
-    ctxt->vctxt.warning = xmlParserValidityWarning;
+    if (ctxt->validate) {
+	ctxt->vctxt.error = xmlParserValidityError;
+	ctxt->vctxt.warning = xmlParserValidityWarning;
+    } else {
+	ctxt->vctxt.error = NULL;
+	ctxt->vctxt.warning = NULL;
+    }
     ctxt->replaceEntities = xmlSubstituteEntitiesDefaultValue;
     ctxt->record_info = 0;
     ctxt->nbChars = 0;
diff --git a/xpath.c b/xpath.c
index bb94ab85..b2b3c893 100644
--- a/xpath.c
+++ b/xpath.c
@@ -71,8 +71,6 @@ int isinf(double d) {
 	    return(-1);
 	case FP_PINF:
 	    return(1);
-	default:
-	    return(0);
     }
     return(0);
 }