2004-01-13 Atsushi Enomoto <atsushi@ximian.com>

[mono.git] / mcs / class / System.XML / System.Xml / XmlInputStream.cs

diff --git a/mcs/class/System.XML/System.Xml/XmlInputStream.cs b/mcs/class/System.XML/System.Xml/XmlInputStream.cs
index d847a8794862feaa524e6d40dbf94b2394b7af5a..fb19a9574dd2d60caa8895551188663a5742a512 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlInputStream.cs
+++ b/mcs/class/System.XML/System.Xml/XmlInputStream.cs
@@ -26,33 +26,7 @@ namespace Mono.Xml.Native
                }
 
                public XmlStreamReader (Stream input)
-                       : this (new XmlInputStream (input, true))
-               {
-               }
-
-               public XmlStreamReader (Stream input, bool docent)
-                       : this (new XmlInputStream (input, docent))
-               {
-               }
-
-//             public XmlStreamReader (string url)
-//                     : this (url, true)
-//             {
-//             }
-//
-//             public XmlStreamReader (string url, bool docent)
-//                     : this (new XmlInputStream (url, docent, null, null))
-//             {
-//             }
-
-               public XmlStreamReader (string url, XmlResolver resolver, string baseURI)
-                       : this (url, true, resolver, baseURI)
-               {
-               }
-
-               public XmlStreamReader (string url, bool docent, XmlResolver resolver,
-                       string baseURI)
-                       : this (new XmlInputStream (url, docent, resolver, baseURI))
+                       : this (new XmlInputStream (input))
                {
                }
 
@@ -79,38 +53,11 @@ namespace Mono.Xml.Native
                byte[] buffer = new byte[256];
                int bufLength;
                int bufPos;
-               bool isDocumentEntity;  // allow omitting "version" or not.
 
                static XmlException encodingException = new XmlException ("invalid encoding specification.");
-/*
-               public XmlInputStream (string url)
-                       : this (url, true)
-               {
-               }
-*/
-               public XmlInputStream (string url, bool docent, XmlResolver resolver, string baseURI)
-               {
-                       this.isDocumentEntity = docent;
-                       // Use XmlResolver to resolve external entity.
-
-                       if (resolver == null)
-                               resolver = new XmlUrlResolver ();
-                       Uri uri = resolver.ResolveUri (
-                               baseURI == null || baseURI == String.Empty ?
-                                null : new Uri (baseURI), url);
-                       Stream s = resolver.GetEntity (uri, null, typeof (Stream)) as Stream;
-
-                       Initialize (s);
-               }
 
                public XmlInputStream (Stream stream)
-                       : this (stream, true)
-               {
-               }
-
-               public XmlInputStream (Stream stream, bool docent)
                {
-                       this.isDocumentEntity = docent;
                        Initialize (stream);
                }
 
@@ -170,11 +117,7 @@ namespace Mono.Xml.Native
                                        c = SkipWhitespace (ms);
 
                                        // version. It is optional here.
-                                       if (c != 'v') {
-                                               // FIXME: temporarily comment out here.
-//                                             if (isDocumentEntity)
-//                                                     throw new XmlException ("invalid xml declaration.");
-                                       } else {
+                                       if (c == 'v') {
                                                ms.WriteByte ((byte)'v');
                                                while (loop++ >= 0 && c >= 0) {
                                                        c = stream.ReadByte ();