2004-12-03 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* XmlTextReader.cs: don't use \0 as buffer terminator.
	* XmlInputStream.cs: s/Array.Copy/Buffer.BlockCopy/.

svn path=/trunk/mcs/; revision=36995

diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog
index d73d1904e6053e77856122af84e7fd3691ac4367..f99222339cd0bc2d3d5f6ec6738d79e981f57e22 100644 (file)
--- a/mcs/class/System.XML/System.Xml/ChangeLog
+++ b/mcs/class/System.XML/System.Xml/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-03 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * XmlTextReader.cs: don't use \0 as buffer terminator.
+       * XmlInputStream.cs: s/Array.Copy/Buffer.BlockCopy/.
+
 2004-11-30  Atsushi Enomoto <atsushi@ximian.com>
 
        * DTDReader.cs : Consideration on parameter entity was missing for 

diff --git a/mcs/class/System.XML/System.Xml/XmlInputStream.cs b/mcs/class/System.XML/System.Xml/XmlInputStream.cs
index 9d54ef03d5f9601cae75e441861d3480ada335d8..e60951cd38e85961d6e16e68ad55e2230725ce9e 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlInputStream.cs
+++ b/mcs/class/System.XML/System.Xml/XmlInputStream.cs
@@ -269,13 +269,13 @@ namespace System.Xml
                {
                        int ret;
                        if (count <= bufLength - bufPos)        {       // all from buffer
-                               Array.Copy (this.buffer, bufPos, buffer, offset, count);
+                               Buffer.BlockCopy (this.buffer, bufPos, buffer, offset, count);
                                bufPos += count;
                                ret = count;
                        } else {
                                int bufRest = bufLength - bufPos;
                                if (bufLength > bufPos) {
-                                       Array.Copy (this.buffer, bufPos, buffer, offset, bufRest);
+                                       Buffer.BlockCopy (this.buffer, bufPos, buffer, offset, bufRest);
                                        bufPos += bufRest;
                                }
                                ret = bufRest +

diff --git a/mcs/class/System.XML/System.Xml/XmlTextReader.cs b/mcs/class/System.XML/System.Xml/XmlTextReader.cs
index af12b95b5109b60c4f5d47d1fab609c03e667b13..0b5a0cbdee74badb437f28a17d4df0a7d4f8497d 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlTextReader.cs
+++ b/mcs/class/System.XML/System.Xml/XmlTextReader.cs
@@ -1165,9 +1165,8 @@ namespace System.Xml
                                else
                                        return PeekChar ();
                        }
-                       else
-                               return peekChars [peekCharsIndex] != 0 ?
-                                       peekChars [peekCharsIndex] : -1;
+
+                       return peekChars [peekCharsIndex];
                }
 
                private int ReadChar ()
@@ -1197,12 +1196,7 @@ namespace System.Xml
                {
                        peekCharsIndex = 0;
                        peekCharsLength = reader.Read (peekChars, 0, peekCharCapacity);
-                       if (peekCharsLength == 0)
-                               return false;
-                       // set EOF
-                       if (peekCharsLength < peekCharCapacity)
-                               peekChars [peekCharsLength] = (char) 0;
-                       return true;
+                       return (peekCharsLength != 0);
                }
 
                private string ExpandSurrogateChar (int ch)