Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/mcs/class
diff options
context:
space:
mode:
authorMarek Safar <marek.safar@gmail.com>2007-11-15 17:14:49 +0300
committerMarek Safar <marek.safar@gmail.com>2007-11-15 17:14:49 +0300
commite61dde083ea36098af5f7645ee9716b470351751 (patch)
treebdd88d59b09106464d23b561edd1006ca77f9534 /mcs/class
parent28771db34eac2756295ffda9b8045f8a1554cb5b (diff)
Warnings cleanup
svn path=/trunk/mcs/; revision=89678
Diffstat (limited to 'mcs/class')
-rw-r--r--mcs/class/System/Microsoft.VisualBasic/VBCodeCompiler.cs8
-rw-r--r--mcs/class/System/System.CodeDom.Compiler/CodeDomProvider.cs15
-rw-r--r--mcs/class/System/System.ComponentModel.Design/DesignerTransactionCloseEventArgs.cs12
-rw-r--r--mcs/class/System/System.ComponentModel/BackgroundWorker.cs3
-rw-r--r--mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs3
-rw-r--r--mcs/class/System/System.Configuration/LocalFileSettingsProvider.cs2
-rw-r--r--mcs/class/System/System.Diagnostics/DiagnosticsConfigurationHandler.cs2
-rw-r--r--mcs/class/System/System.Diagnostics/Switch.cs2
-rw-r--r--mcs/class/System/System.Diagnostics/XmlWriterTraceListener.cs2
-rw-r--r--mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs2
-rw-r--r--mcs/class/System/System.Net.Security/SslStream.cs4
-rw-r--r--mcs/class/System/System.Net/FtpDataStream.cs3
-rw-r--r--mcs/class/System/System.Net/FtpWebRequest.cs2
-rw-r--r--mcs/class/System/System.Net/HttpConnection.cs2
-rw-r--r--mcs/class/System/System.Net/HttpWebRequest.cs2
-rw-r--r--mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs12
16 files changed, 32 insertions, 44 deletions
diff --git a/mcs/class/System/Microsoft.VisualBasic/VBCodeCompiler.cs b/mcs/class/System/Microsoft.VisualBasic/VBCodeCompiler.cs
index 866adfa0db1..e3a1ebdc5c5 100644
--- a/mcs/class/System/Microsoft.VisualBasic/VBCodeCompiler.cs
+++ b/mcs/class/System/Microsoft.VisualBasic/VBCodeCompiler.cs
@@ -48,7 +48,10 @@ namespace Microsoft.VisualBasic
internal class VBCodeCompiler : VBCodeGenerator, ICodeCompiler
{
static string windowsMonoPath;
+#if NET_2_0
static string windowsvbncPath;
+#endif
+
static VBCodeCompiler ()
{
if (Path.DirectorySeparatorChar == '\\') {
@@ -68,9 +71,6 @@ namespace Microsoft.VisualBasic
#if NET_2_0
windowsvbncPath =
Path.Combine (p, "2.0\\vbnc.exe");
-#else
- windowsvbncPath =
- Path.Combine (p, "1.0\\vbnc.exe");
#endif
}
}
@@ -129,6 +129,7 @@ namespace Microsoft.VisualBasic
}
}
+#if NET_2_0
static string BuildArgs (CompilerParameters options, string[] fileNames)
{
StringBuilder args = new StringBuilder ();
@@ -219,6 +220,7 @@ namespace Microsoft.VisualBasic
{
return temp_files.AddExtension (extension, keepFile);
}
+#endif
private static string GetTempFileNameWithExtension (TempFileCollection temp_files, string extension)
{
diff --git a/mcs/class/System/System.CodeDom.Compiler/CodeDomProvider.cs b/mcs/class/System/System.CodeDom.Compiler/CodeDomProvider.cs
index 352b01cbae5..7ff01b07d8b 100644
--- a/mcs/class/System/System.CodeDom.Compiler/CodeDomProvider.cs
+++ b/mcs/class/System/System.CodeDom.Compiler/CodeDomProvider.cs
@@ -67,14 +67,6 @@ namespace System.CodeDom.Compiler {
}
//
- // This is used to prevent confusing Moma about methods not implemented.
- //
- Exception GetNotImplemented ()
- {
- return new NotImplementedException ();
- }
-
- //
// Methods
//
#if NET_2_0
@@ -311,6 +303,13 @@ namespace System.CodeDom.Compiler {
}
#endif
+ //
+ // This is used to prevent confusing Moma about methods not implemented.
+ //
+ Exception GetNotImplemented ()
+ {
+ return new NotImplementedException ();
+ }
#endif
}
}
diff --git a/mcs/class/System/System.ComponentModel.Design/DesignerTransactionCloseEventArgs.cs b/mcs/class/System/System.ComponentModel.Design/DesignerTransactionCloseEventArgs.cs
index bfd755aa6ac..50234f49a79 100644
--- a/mcs/class/System/System.ComponentModel.Design/DesignerTransactionCloseEventArgs.cs
+++ b/mcs/class/System/System.ComponentModel.Design/DesignerTransactionCloseEventArgs.cs
@@ -36,22 +36,24 @@ namespace System.ComponentModel.Design
public class DesignerTransactionCloseEventArgs : EventArgs
{
private bool commit;
+#if NET_2_0
private bool last_transaction;
+#endif
#if NET_2_0
- public
-#endif
- DesignerTransactionCloseEventArgs (bool commit, bool lastTransaction)
+ public DesignerTransactionCloseEventArgs (bool commit, bool lastTransaction)
{
this.commit = commit;
- last_transaction = lastTransaction;
+ this.last_transaction = lastTransaction;
}
+#endif
#if NET_2_0
[Obsolete ("Use another constructor that indicates lastTransaction")]
#endif
- public DesignerTransactionCloseEventArgs (bool commit) : this (commit, false)
+ public DesignerTransactionCloseEventArgs (bool commit)
{
+ this.commit = commit;
}
#if NET_2_0
diff --git a/mcs/class/System/System.ComponentModel/BackgroundWorker.cs b/mcs/class/System/System.ComponentModel/BackgroundWorker.cs
index 501ed004389..ed9190cc5e8 100644
--- a/mcs/class/System/System.ComponentModel/BackgroundWorker.cs
+++ b/mcs/class/System/System.ComponentModel/BackgroundWorker.cs
@@ -43,9 +43,6 @@ namespace System.ComponentModel
AsyncOperation async;
bool cancel_pending, report_progress = false, support_cancel = false;
- Dictionary<object,AsyncOperation> operations =
- new Dictionary<object,AsyncOperation> ();
-
public event DoWorkEventHandler DoWork;
public event ProgressChangedEventHandler ProgressChanged;
public event RunWorkerCompletedEventHandler RunWorkerCompleted;
diff --git a/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs b/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
index 2e2cd61e35c..fa93c412de8 100644
--- a/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
+++ b/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
@@ -578,8 +578,6 @@ namespace System.Configuration
if (userSection == null)
continue;
- XmlDocument doc = new XmlDocument ();
-
foreach (SettingsPropertyValue value in collection) {
if (checkUserLevel && value.Property.Attributes.Contains (typeof (SettingsManageabilityAttribute)) != isRoaming)
continue;
@@ -591,7 +589,6 @@ namespace System.Configuration
}
if (element.Value.ValueXml == null)
element.Value.ValueXml = new XmlDocument ().CreateDocumentFragment ();
- doc = element.Value.ValueXml.OwnerDocument;
switch (value.Property.SerializeAs) {
case SettingsSerializeAs.Xml:
element.Value.ValueXml.InnerXml = value.SerializedValue as string;
diff --git a/mcs/class/System/System.Configuration/LocalFileSettingsProvider.cs b/mcs/class/System/System.Configuration/LocalFileSettingsProvider.cs
index c01e880901a..51b792f375a 100644
--- a/mcs/class/System/System.Configuration/LocalFileSettingsProvider.cs
+++ b/mcs/class/System/System.Configuration/LocalFileSettingsProvider.cs
@@ -107,6 +107,7 @@ namespace System.Configuration
set { impl.ApplicationName = value; }
}
+/*
bool IsUserSetting (SettingsProperty prop)
{
#if CONFIGURATION_DEP
@@ -122,6 +123,7 @@ namespace System.Configuration
return false;
#endif
}
+*/
}
}
diff --git a/mcs/class/System/System.Diagnostics/DiagnosticsConfigurationHandler.cs b/mcs/class/System/System.Diagnostics/DiagnosticsConfigurationHandler.cs
index ca913efcdf2..988d44ee9d2 100644
--- a/mcs/class/System/System.Diagnostics/DiagnosticsConfigurationHandler.cs
+++ b/mcs/class/System/System.Diagnostics/DiagnosticsConfigurationHandler.cs
@@ -287,7 +287,7 @@ namespace System.Diagnostics
d ["indentsize"] = n;
TraceImpl.IndentSize = n;
}
- catch (ConfigurationException e) {
+ catch (ConfigurationException) {
throw;
}
catch (Exception e) {
diff --git a/mcs/class/System/System.Diagnostics/Switch.cs b/mcs/class/System/System.Diagnostics/Switch.cs
index 83eb57ebd95..3f9e61c1aa2 100644
--- a/mcs/class/System/System.Diagnostics/Switch.cs
+++ b/mcs/class/System/System.Diagnostics/Switch.cs
@@ -45,8 +45,8 @@ namespace System.Diagnostics
private string name;
private string description;
private int switchSetting;
- private string value;
#if NET_2_0
+ private string value;
private string defaultSwitchValue;
#endif
// MS Behavior is that (quoting from MSDN for OnSwitchSettingChanged()):
diff --git a/mcs/class/System/System.Diagnostics/XmlWriterTraceListener.cs b/mcs/class/System/System.Diagnostics/XmlWriterTraceListener.cs
index 5a122c34e13..8af4adda925 100644
--- a/mcs/class/System/System.Diagnostics/XmlWriterTraceListener.cs
+++ b/mcs/class/System/System.Diagnostics/XmlWriterTraceListener.cs
@@ -79,7 +79,7 @@ namespace System.Diagnostics
this.name = name;
}
- public virtual void Close ()
+ public override void Close ()
{
w.Close ();
}
diff --git a/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs b/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs
index a8f1e7b7a90..f09174673e3 100644
--- a/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs
+++ b/mcs/class/System/System.Net.NetworkInformation/NetworkInterface.cs
@@ -202,7 +202,7 @@ namespace System.Net.NetworkInformation {
public static NetworkInterface [] ImplGetAllNetworkInterfaces ()
{
- Win32_IP_ADAPTER_INFO [] ai = GetAdaptersInfo ();
+// Win32_IP_ADAPTER_INFO [] ai = GetAdaptersInfo ();
Win32_IP_ADAPTER_ADDRESSES [] aa = GetAdaptersAddresses ();
NetworkInterface [] ret = new NetworkInterface [aa.Length];
for (int i = 0; i < ret.Length; i++)
diff --git a/mcs/class/System/System.Net.Security/SslStream.cs b/mcs/class/System/System.Net.Security/SslStream.cs
index 3ac456563de..b47171a524f 100644
--- a/mcs/class/System/System.Net.Security/SslStream.cs
+++ b/mcs/class/System/System.Net.Security/SslStream.cs
@@ -299,14 +299,14 @@ namespace System.Net.Security
#endregion // Properties
#region Methods
-
+/*
AsymmetricAlgorithm GetPrivateKey (X509Certificate cert, string targetHost)
{
// FIXME: what can I do for non-X509Certificate2 ?
X509Certificate2 cert2 = cert as X509Certificate2;
return cert2 != null ? cert2.PrivateKey : null;
}
-
+*/
X509Certificate OnCertificateSelection (X509CertificateCollection clientCerts, X509Certificate serverCert, string targetHost, X509CertificateCollection serverRequestedCerts)
{
string [] acceptableIssuers = new string [serverRequestedCerts != null ? serverRequestedCerts.Count : 0];
diff --git a/mcs/class/System/System.Net/FtpDataStream.cs b/mcs/class/System/System.Net/FtpDataStream.cs
index 0638e28ca0b..bc33e24c0d8 100644
--- a/mcs/class/System/System.Net/FtpDataStream.cs
+++ b/mcs/class/System/System.Net/FtpDataStream.cs
@@ -25,7 +25,6 @@ namespace System.Net
bool disposed;
bool isRead;
int totalRead;
- int contentLength;
ManualResetEvent closewh;
@@ -39,7 +38,6 @@ namespace System.Net
throw new ArgumentException ("socket");
this.request = request;
- this.contentLength = socket.Available;
this.networkStream = new NetworkStream (socket, true);
this.isRead = isRead;
@@ -129,7 +127,6 @@ namespace System.Net
totalRead += nbytes;
if (nbytes == 0) {
- contentLength = totalRead;
networkStream.Close ();
request.SetTransferCompleted ();
}
diff --git a/mcs/class/System/System.Net/FtpWebRequest.cs b/mcs/class/System/System.Net/FtpWebRequest.cs
index 93f76fb64cc..4500377a56f 100644
--- a/mcs/class/System/System.Net/FtpWebRequest.cs
+++ b/mcs/class/System/System.Net/FtpWebRequest.cs
@@ -171,7 +171,7 @@ namespace System.Net
}
[MonoTODO]
- public static RequestCachePolicy DefaultCachePolicy
+ public static new RequestCachePolicy DefaultCachePolicy
{
get {
throw GetMustImplement ();
diff --git a/mcs/class/System/System.Net/HttpConnection.cs b/mcs/class/System/System.Net/HttpConnection.cs
index 610de80c9a6..f42a05da78d 100644
--- a/mcs/class/System/System.Net/HttpConnection.cs
+++ b/mcs/class/System/System.Net/HttpConnection.cs
@@ -54,7 +54,6 @@ namespace System.Net {
int chunked_uses;
bool context_bound;
bool secure;
- X509Certificate2 cert;
AsymmetricAlgorithm key;
public HttpConnection (Socket sock, EndPointListener epl, bool secure, X509Certificate2 cert, AsymmetricAlgorithm key)
@@ -62,7 +61,6 @@ namespace System.Net {
this.sock = sock;
this.epl = epl;
this.secure = secure;
- this.cert = cert;
this.key = key;
if (secure == false) {
stream = new NetworkStream (sock, false);
diff --git a/mcs/class/System/System.Net/HttpWebRequest.cs b/mcs/class/System/System.Net/HttpWebRequest.cs
index 305703e292c..43ca984ac67 100644
--- a/mcs/class/System/System.Net/HttpWebRequest.cs
+++ b/mcs/class/System/System.Net/HttpWebRequest.cs
@@ -292,7 +292,7 @@ namespace System.Net
#if NET_2_0
[MonoTODO]
- public static RequestCachePolicy DefaultCachePolicy
+ public static new RequestCachePolicy DefaultCachePolicy
{
get {
throw GetMustImplement ();
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs
index e7358f099f5..faae9347838 100644
--- a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509Chain.cs
@@ -495,15 +495,15 @@ namespace System.Security.Cryptography.X509Certificates {
}
// TODO 6.1.3.d - check if certificate policies extension is present
- if (false) {
+ //if (false) {
// TODO - for X509ChainStatusFlags.InvalidPolicyConstraints
// using X509ChainPolicy.ApplicationPolicy and X509ChainPolicy.CertificatePolicy
// TODO - check for X509ChainStatusFlags.NoIssuanceChainPolicy
- } else {
+ //} else {
// TODO 6.1.3.e - set valid_policy_tree to NULL
- }
+ //}
// TODO 6.1.3.f - verify explict_policy > 0 if valid_policy_tree != NULL
}
@@ -801,12 +801,6 @@ namespace System.Security.Cryptography.X509Certificates {
return X509ChainStatusFlags.NoError;
}
- private MX.X509Crl OnlineCheck (X509Certificate2 certificate)
- {
- // CRL doesn't exists or couldn't be downloaded
- return null;
- }
-
private MX.X509Crl FindCrl (X509Certificate2 caCertificate)
{
string subject = caCertificate.SubjectName.Decode (X500DistinguishedNameFlags.None);