From 7331e5cab8b34d89a5972a6deda83dd4c02beb6e Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@src.gnome.org>
Date: Thu, 31 Mar 2005 14:59:00 +0000
Subject: [PATCH] fixed #172260 redundant assignment. fixed xmlSAXParseDoc()
 and

* SAX.c: fixed #172260 redundant assignment.
* parser.c include/libxml/parser.h: fixed xmlSAXParseDoc() and
  xmlParseDoc() signatures #172257.
Daniel
---
 ChangeLog               | 6 ++++++
 SAX.c                   | 1 -
 include/libxml/parser.h | 4 ++--
 parser.c                | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1ced5dc3..9eec4564 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Mar 31 16:57:18 CEST 2005 Daniel Veillard <daniel@veillard.com>
+
+	* SAX.c: fixed #172260 redundant assignment.
+	* parser.c include/libxml/parser.h: fixed xmlSAXParseDoc() and 
+	  xmlParseDoc() signatures #172257.
+
 Thu Mar 31 16:11:10 CEST 2005 Daniel Veillard <daniel@veillard.com>
 
 	* parser.c: fix potential crash if ctxt->sax->ignorableWhitespace
diff --git a/SAX.c b/SAX.c
index 05061b65..9d9afa16 100644
--- a/SAX.c
+++ b/SAX.c
@@ -116,7 +116,6 @@ inithtmlDefaultSAXHandler(xmlSAXHandlerV1 *hdlr)
     hdlr->cdataBlock = xmlSAX2CDataBlock;
     hdlr->ignorableWhitespace = xmlSAX2IgnorableWhitespace;
     hdlr->processingInstruction = xmlSAX2ProcessingInstruction;
-    hdlr->processingInstruction = NULL;
     hdlr->comment = xmlSAX2Comment;
     hdlr->warning = xmlParserWarning;
     hdlr->error = xmlParserError;
diff --git a/include/libxml/parser.h b/include/libxml/parser.h
index 6e2d2419..e0de43fa 100644
--- a/include/libxml/parser.h
+++ b/include/libxml/parser.h
@@ -825,7 +825,7 @@ XMLPUBFUN int XMLCALL
  */
 #ifdef LIBXML_SAX1_ENABLED
 XMLPUBFUN xmlDocPtr XMLCALL	
-		xmlParseDoc		(xmlChar *cur);
+		xmlParseDoc		(const xmlChar *cur);
 XMLPUBFUN xmlDocPtr XMLCALL	
 		xmlParseFile		(const char *filename);
 XMLPUBFUN xmlDocPtr XMLCALL	
@@ -877,7 +877,7 @@ XMLPUBFUN int XMLCALL
 					 int size);
 XMLPUBFUN xmlDocPtr XMLCALL	
 		xmlSAXParseDoc		(xmlSAXHandlerPtr sax,
-					 xmlChar *cur,
+					 const xmlChar *cur,
 					 int recovery);
 XMLPUBFUN xmlDocPtr XMLCALL	
 		xmlSAXParseMemory	(xmlSAXHandlerPtr sax,
diff --git a/parser.c b/parser.c
index 990d2c6d..c3492821 100644
--- a/parser.c
+++ b/parser.c
@@ -12212,7 +12212,7 @@ xmlCreateDocParserCtxt(const xmlChar *cur) {
  */
 
 xmlDocPtr
-xmlSAXParseDoc(xmlSAXHandlerPtr sax, xmlChar *cur, int recovery) {
+xmlSAXParseDoc(xmlSAXHandlerPtr sax, const xmlChar *cur, int recovery) {
     xmlDocPtr ret;
     xmlParserCtxtPtr ctxt;
     xmlSAXHandlerPtr oldsax = NULL;
@@ -12253,7 +12253,7 @@ xmlSAXParseDoc(xmlSAXHandlerPtr sax, xmlChar *cur, int recovery) {
  */
 
 xmlDocPtr
-xmlParseDoc(xmlChar *cur) {
+xmlParseDoc(const xmlChar *cur) {
     return(xmlSAXParseDoc(NULL, cur, 0));
 }
 #endif /* LIBXML_SAX1_ENABLED */