Warnings cleanup

diff --git a/mcs/class/System/System/Uri.cs b/mcs/class/System/System/Uri.cs
index 4ec432549f7bf6de32891f8449767838f55e218c..e74ef5d2f09f8d13cddfbb8ddbb375ef0f3c5abd 100644 (file)
--- a/mcs/class/System/System/Uri.cs
+++ b/mcs/class/System/System/Uri.cs
@@ -69,7 +69,6 @@ namespace System {
                // o  UNC is supported, as starts with "\\" for windows,
                //    or "//" with unix.
 
-               private bool isUnixFilePath;
                private string source;
                private string scheme = String.Empty;
                private string host = String.Empty;
@@ -79,7 +78,6 @@ namespace System {
                private string fragment = String.Empty;
                private string userinfo;
                private bool isUnc;
-               private bool isOpaquePart;
                private bool isAbsoluteUri = true;
                private long scope_id;
 
@@ -1239,7 +1237,6 @@ namespace System {
 
                private void ParseAsUnixAbsoluteFilePath (string uriString)
                {
-                       isUnixFilePath = true;
                        scheme = UriSchemeFile;
                        port = -1;
                        fragment = String.Empty;
@@ -1350,7 +1347,6 @@ namespace System {
 
                        isAbsoluteUri = elements.isAbsoluteUri;
                        isUnc = elements.isUnc;
-                       isUnixFilePath = elements.isUnixFilePath;
                        scope_id = elements.scopeId;
 
                        return null;
@@ -1625,10 +1621,7 @@ namespace System {
 
                private string GetOpaqueWiseSchemeDelimiter ()
                {
-                       if (isOpaquePart)
-                               return ":";
-                       else
-                               return GetSchemeDelimiter (scheme);
+                       return GetSchemeDelimiter (scheme);
                }
 
                [Obsolete]

diff --git a/mcs/class/System/System/UriParseComponents.cs b/mcs/class/System/System/UriParseComponents.cs
index b7d4208ed2bf880fab7ded819212bf3a78e36492..0de6d8f91ef15bdec118d786fba901e5e37494b6 100644 (file)
--- a/mcs/class/System/System/UriParseComponents.cs
+++ b/mcs/class/System/System/UriParseComponents.cs
@@ -305,8 +305,6 @@ namespace System {
                {
                        if (state.elements.delimiter != Uri.SchemeDelimiter && state.elements.scheme != Uri.UriSchemeMailto)
                                return state.remaining.Length > 0;
-
-                       string part = state.remaining;
                        
                        return ParseUser (state) &&
                                ParseHost (state) &&

diff --git a/mcs/class/System/System/UriParser.cs b/mcs/class/System/System/UriParser.cs
index be3036b505cac983218d85d9da30f7c9405c2a5f..9fc8483cdcdc482a7f82a8e27300cb4140de0b02 100644 (file)
--- a/mcs/class/System/System/UriParser.cs
+++ b/mcs/class/System/System/UriParser.cs
@@ -88,7 +88,7 @@ namespace System {
                                return elements.host;
                        case UriComponents.Port: {
                                int p = elements.port;
-                               if (p != null && p >= 0 && p != dp)
+                               if (p >= 0 && p != dp)
                                        return p.ToString (CultureInfo.InvariantCulture);
                                return String.Empty;
                        }
@@ -144,7 +144,7 @@ namespace System {
 
                        if ((components & UriComponents.Port) != 0) {
                                int p = elements.port;
-                               if (p != null && p >= 0 && p != dp) {
+                               if (p >= 0 && p != dp) {
                                        sb.Append (":");
                                        sb.Append (elements.port);
                                }