Browse Source

[System] Warnings cleanup

Marek Safar 9 years ago
parent
commit
092279ecd6
19 changed files with 46 additions and 13 deletions
  1. 2 2
      mcs/class/System/Mono.Net.Security/MonoTlsStream.cs
  2. 0 1
      mcs/class/System/System.Net/WebConnection.cs
  3. 0 2
      mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2ImplMono.cs
  4. 0 2
      mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs
  5. 0 1
      mcs/class/System/System.dll.sources
  6. 0 1
      mcs/class/System/mobile_System.dll.sources
  7. 2 0
      mcs/class/referencesource/System/compmod/system/codedom/CodeNamespace.cs
  8. 2 0
      mcs/class/referencesource/System/compmod/system/codedom/CodePropertyReferenceExpression.cs
  9. 4 0
      mcs/class/referencesource/System/compmod/system/componentmodel/LicFileLicenseProvider.cs
  10. 2 1
      mcs/class/referencesource/System/compmod/system/componentmodel/ReflectEventDescriptor.cs
  11. 2 0
      mcs/class/referencesource/System/compmod/system/componentmodel/ReflectPropertyDescriptor.cs
  12. 2 0
      mcs/class/referencesource/System/compmod/system/componentmodel/TypeConverter.cs
  13. 1 1
      mcs/class/referencesource/System/net/System/Net/WebRequest.cs
  14. 8 0
      mcs/class/referencesource/System/net/System/Net/connectionpool.cs
  15. 2 0
      mcs/class/referencesource/System/net/System/Net/filewebrequest.cs
  16. 6 0
      mcs/class/referencesource/System/net/System/Net/webclient.cs
  17. 2 0
      mcs/class/referencesource/System/regex/system/text/regularexpressions/RegexCompiler.cs
  18. 2 0
      mcs/class/referencesource/System/services/monitoring/system/diagnosticts/AsyncStreamReader.cs
  19. 9 2
      mcs/class/referencesource/System/services/monitoring/system/diagnosticts/Process.cs

+ 2 - 2
mcs/class/System/Mono.Net.Security/MonoTlsStream.cs

@@ -75,7 +75,7 @@ namespace Mono.Net.Security
 		}
 
 #if SECURITY_DEP
-		readonly ChainValidationHelper validationHelper;
+//		readonly ChainValidationHelper validationHelper;
 		readonly MonoTlsSettings settings;
 
 		public MonoTlsStream (HttpWebRequest request, NetworkStream networkStream)
@@ -87,7 +87,7 @@ namespace Mono.Net.Security
 			provider = request.TlsProvider ?? MonoTlsProviderFactory.GetProviderInternal ();
 			status = WebExceptionStatus.SecureChannelFailure;
 
-			validationHelper = ChainValidationHelper.Create (provider.Provider, ref settings, this);
+			/*validationHelper =*/ ChainValidationHelper.Create (provider.Provider, ref settings, this);
 		}
 
 		internal Stream CreateStream (byte[] buffer)

+ 0 - 1
mcs/class/System/System.Net/WebConnection.cs

@@ -83,7 +83,6 @@ namespace System.Net
 		HttpWebRequest connect_request;
 
 		Exception connect_exception;
-		static object classLock = new object ();
 		MonoTlsStream tlsStream;
 
 #if MONOTOUCH && !MONOTOUCH_TV && !MONOTOUCH_WATCH

+ 0 - 2
mcs/class/System/System.Security.Cryptography.X509Certificates/X509Certificate2ImplMono.cs

@@ -52,7 +52,6 @@ namespace System.Security.Cryptography.X509Certificates
 	{
 		bool _archived;
 		X509ExtensionCollection _extensions;
-		string _serial;
 		PublicKey _publicKey;
 		X500DistinguishedName issuer_name;
 		X500DistinguishedName subject_name;
@@ -559,7 +558,6 @@ namespace System.Security.Cryptography.X509Certificates
 			_cert = null;
 			_archived = false;
 			_extensions = null;
-			_serial = null;
 			_publicKey = null;
 			issuer_name = null;
 			subject_name = null;

+ 0 - 2
mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs

@@ -47,8 +47,6 @@ namespace System.Security.Cryptography.X509Certificates {
 
 		X509ChainImpl impl;
 
-		static X509ChainStatus[] Empty = new X509ChainStatus [0];
-
 		internal X509ChainImpl Impl {
 			get {
 				X509Helper2.ThrowIfContextInvalid (impl);

+ 0 - 1
mcs/class/System/System.dll.sources

@@ -1107,7 +1107,6 @@ ReferenceSources/Win32Exception.cs
 ../referencesource/System/net/System/Net/NetworkInformation/SystemGatewayIPAddressInformation.cs
 ../referencesource/System/net/System/Net/NetworkInformation/SystemIPAddressInformation.cs
 ../referencesource/System/net/System/Net/NetworkInformation/SystemMulticastIPAddressInformation.cs
-../referencesource/System/net/System/Net/NetworkInformation/SystemUnicastIPAddressInformation.cs
 ../referencesource/System/net/System/Net/NetworkInformation/SystemTcpConnection.cs
 ../referencesource/System/net/System/Net/NetworkInformation/TcpConnection.cs
 ../referencesource/System/net/System/Net/NetworkInformation/TcpState.cs

+ 0 - 1
mcs/class/System/mobile_System.dll.sources

@@ -840,7 +840,6 @@ ReferenceSources/Win32Exception.cs
 ../referencesource/System/net/System/Net/NetworkInformation/SystemGatewayIPAddressInformation.cs
 ../referencesource/System/net/System/Net/NetworkInformation/SystemIPAddressInformation.cs
 ../referencesource/System/net/System/Net/NetworkInformation/SystemMulticastIPAddressInformation.cs
-../referencesource/System/net/System/Net/NetworkInformation/SystemUnicastIPAddressInformation.cs
 ../referencesource/System/net/System/Net/NetworkInformation/SystemTcpConnection.cs
 ../referencesource/System/net/System/Net/NetworkInformation/TcpConnection.cs
 ../referencesource/System/net/System/Net/NetworkInformation/TcpState.cs

+ 2 - 0
mcs/class/referencesource/System/compmod/system/codedom/CodeNamespace.cs

@@ -31,7 +31,9 @@ namespace System.CodeDom {
         private CodeNamespaceImportCollection imports = new CodeNamespaceImportCollection();
         private CodeCommentStatementCollection comments = new CodeCommentStatementCollection();
         private CodeTypeDeclarationCollection classes = new CodeTypeDeclarationCollection();
+#if CODEDOM_NESTED_NAMESPACES
         private CodeNamespaceCollection namespaces = new CodeNamespaceCollection();
+#endif
         
         private int  populated = 0x0;
         private const int ImportsCollection = 0x1;

+ 2 - 0
mcs/class/referencesource/System/compmod/system/codedom/CodePropertyReferenceExpression.cs

@@ -27,7 +27,9 @@ namespace System.CodeDom {
     public class CodePropertyReferenceExpression : CodeExpression {
         private CodeExpression targetObject;
         private string propertyName;
+#if !MONO
         private CodeExpressionCollection parameters = new CodeExpressionCollection();
+#endif
 
         /// <devdoc>
         ///    <para>

+ 4 - 0
mcs/class/referencesource/System/compmod/system/componentmodel/LicFileLicenseProvider.cs

@@ -98,11 +98,15 @@ namespace System.ComponentModel {
         }
 
         private class LicFileLicense : License {
+#if !MONO
             private LicFileLicenseProvider owner;
+#endif
             private string key;
 
             public LicFileLicense(LicFileLicenseProvider owner, string key) {
+#if !MONO
                 this.owner = owner;
+#endif
                 this.key = key;
             }
             public override string LicenseKey { 

+ 2 - 1
mcs/class/referencesource/System/compmod/system/componentmodel/ReflectEventDescriptor.cs

@@ -67,9 +67,10 @@ namespace System.ComponentModel {
     /// </devdoc>
     [HostProtection(SharedState = true)]
     internal sealed class ReflectEventDescriptor : EventDescriptor {
-
+#if !MONO
         private static readonly Type[] argsNone = new Type[0];
         private static readonly object  noDefault = new object();
+#endif
 
         private Type type;           // the delegate type for the event
         private readonly Type componentClass; // the class of the component this info is for

+ 2 - 0
mcs/class/referencesource/System/compmod/system/componentmodel/ReflectPropertyDescriptor.cs

@@ -64,7 +64,9 @@ namespace System.ComponentModel {
         
         private static TraceSwitch PropDescCreateSwitch = new TraceSwitch("PropDescCreate", "ReflectPropertyDescriptor: Dump errors when creating property info");
         private static TraceSwitch PropDescUsageSwitch  = new TraceSwitch("PropDescUsage", "ReflectPropertyDescriptor: Debug propertydescriptor usage");
+#if !MONO
         private static TraceSwitch PropDescSwitch       = new TraceSwitch("PropDesc", "ReflectPropertyDescriptor: Debug property descriptor");
+#endif
         
         private static readonly int BitDefaultValueQueried      = BitVector32.CreateMask();
         private static readonly int BitGetQueried               = BitVector32.CreateMask(BitDefaultValueQueried);

+ 2 - 0
mcs/class/referencesource/System/compmod/system/componentmodel/TypeConverter.cs

@@ -28,8 +28,10 @@ namespace System.ComponentModel {
 
         private const string s_UseCompatibleTypeConverterBehavior = "UseCompatibleTypeConverterBehavior";
         private static volatile bool useCompatibleTypeConversion = false;
+#if !MONO
         private static volatile bool firstLoadAppSetting = true;
         private static object loadAppSettingLock = new Object();
+#endif
 
         private static bool UseCompatibleTypeConversion {
             get {

+ 1 - 1
mcs/class/referencesource/System/net/System/Net/WebRequest.cs

@@ -1209,7 +1209,6 @@ namespace System.Net {
             }
         }
 
-#if !MONO
         //
         internal void SetupCacheProtocol(Uri uri)
         {
@@ -1224,6 +1223,7 @@ namespace System.Net {
             }
         }
 
+#if !MONO
         delegate void DelEtwFireBeginWRGet(object id, string uri, bool success, bool synchronous);
         delegate void DelEtwFireEndWRGet(object id, bool success, bool synchronous);
         delegate void DelEtwFireEndWRespGet(object id, bool success, bool synchronous, int statusCode);

+ 8 - 0
mcs/class/referencesource/System/net/System/Net/connectionpool.cs

@@ -146,7 +146,9 @@ namespace System.Net {
             }
             public object OwningObject;
             public GeneralAsyncDelegate AsyncCallback;
+#if !MONO
             public bool Completed;
+#endif
             public ConnectionPool Pool;
             public int CreationTimeout;
         }
@@ -811,7 +813,9 @@ namespace System.Net {
     /// </devdoc>
     sealed internal class InterlockedStack {
         private readonly Stack _stack = new Stack();
+#if !MONO
         private int _count;
+#endif
 
 #if DEBUG
         private readonly Hashtable doublepush = new Hashtable();
@@ -832,7 +836,9 @@ namespace System.Net {
 #if DEBUG
                 GlobalLog.Assert(_count+1 == _stack.Count, "push count mishandle");
 #endif
+#if !MONO
                 _count = _stack.Count;
+#endif
             }
         }
 
@@ -845,7 +851,9 @@ namespace System.Net {
                     GlobalLog.Assert(_count-1 == _stack.Count, "pop count mishandle");
                     doublepush.Remove(pooledStream);
 #endif
+#if !MONO
                     _count = _stack.Count;
+#endif
                 }
                 return pooledStream;
             }

+ 2 - 0
mcs/class/referencesource/System/net/System/Net/filewebrequest.cs

@@ -18,8 +18,10 @@ namespace System.Net {
 
         private static WaitCallback s_GetRequestStreamCallback = new WaitCallback(GetRequestStreamCallback);
         private static WaitCallback s_GetResponseCallback = new WaitCallback(GetResponseCallback);
+#if !MONO
         private static ContextCallback s_WrappedGetRequestStreamCallback = new ContextCallback(GetRequestStreamCallback);
         private static ContextCallback s_WrappedResponseCallback = new ContextCallback(GetResponseCallback);
+#endif
 
     // fields
 

+ 6 - 0
mcs/class/referencesource/System/net/System/Net/webclient.cs

@@ -1092,7 +1092,11 @@ namespace System.Net {
 
             internal long ContentLength;
             internal long Length;
+#if MONO
+            const int Offset = 0;
+#else
             internal int  Offset;
+#endif
 
 
             internal ProgressData Progress;
@@ -1365,8 +1369,10 @@ namespace System.Net {
                 WebClient = webClient;
             }
 
+#if !MONO
             internal long Length;
             internal int  Offset;
+#endif
 
             internal ProgressData Progress;
 

+ 2 - 0
mcs/class/referencesource/System/regex/system/text/regularexpressions/RegexCompiler.cs

@@ -3033,7 +3033,9 @@ namespace System.Text.RegularExpressions {
 
     internal class RegexTypeCompiler : RegexCompiler {
         private static int _typeCount = 0;
+#if !MONO
         private static LocalDataStoreSlot _moduleSlot = Thread.AllocateDataSlot();
+#endif
 
         private  AssemblyBuilder _assembly;
         private  ModuleBuilder  _module;

+ 2 - 0
mcs/class/referencesource/System/services/monitoring/system/diagnosticts/AsyncStreamReader.cs

@@ -41,8 +41,10 @@ namespace System.Diagnostics {
         // a user's char[] directly, instead of our internal char[].
         private int _maxCharsPerBuffer;
 
+#pragma warning disable 414
         // Store a backpointer to the process class, to check for user callbacks
         private Process process;
+#pragma warning restore
 
         // Delegate to call user function.
         private UserCallBack userCallBack;

+ 9 - 2
mcs/class/referencesource/System/services/monitoring/system/diagnosticts/Process.cs

@@ -91,12 +91,14 @@ namespace System.Diagnostics {
 		
         DateTime exitTime;
         bool haveExitTime;
-        
+
+#if !MONO
         bool responding;
         bool haveResponding;
         
         bool priorityBoostEnabled;
         bool havePriorityBoostEnabled;
+#endif
         
         bool raisedOnExited;
         RegisteredWaitHandle registeredWaitHandle;
@@ -108,7 +110,9 @@ namespace System.Diagnostics {
         OperatingSystem operatingSystem;
         bool disposed;
         
+#if !MONO
         static object s_CreateProcessLock = new object();
+#endif
         
         // This enum defines the operation mode for redirected process stream.
         // We don't support switching between synchronous mode and asynchronous mode.
@@ -139,8 +143,9 @@ namespace System.Diagnostics {
         internal bool pendingOutputRead;
         internal bool pendingErrorRead;
 
-
+#if !MONO
         private static SafeFileHandle InvalidPipeHandle = new SafeFileHandle(IntPtr.Zero, false);
+#endif
 #if DEBUG
         internal static TraceSwitch processTracing = new TraceSwitch("processTracing", "Controls debug output from Process component");
 #else
@@ -1873,8 +1878,10 @@ namespace System.Diagnostics {
             haveProcessorAffinity = false;
             havePriorityClass = false;
             haveExitTime = false;
+#if !MONO
             haveResponding = false;
             havePriorityBoostEnabled = false;
+#endif
         }
 
         /// <devdoc>