* ConfigurationManager.cs: Fixed line endings. Avoid warning by

changing accessibility of ChangeConfigurationSystem to internal.
* Configuration.cs: Fixed compiler warnings.
* DpapiProtectedConfigurationProvider.cs: Fixed line endings.

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

diff --git a/mcs/class/System.Configuration/System.Configuration/ChangeLog b/mcs/class/System.Configuration/System.Configuration/ChangeLog
index 1f1f6120eb67b0e4ad5d06f57670f3ad16aeefb6..fb1aa8650b9071f3684623facd9ae17af1fdf990 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/ChangeLog
+++ b/mcs/class/System.Configuration/System.Configuration/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-31  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * ConfigurationManager.cs: Fixed line endings. Avoid warning by
+       changing accessibility of ChangeConfigurationSystem to internal.
+       * Configuration.cs: Fixed compiler warnings.
+       * DpapiProtectedConfigurationProvider.cs: Fixed line endings.
+
 2007-08-21  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ConfigurationManager.cs : To open exe configuration, use 

diff --git a/mcs/class/System.Configuration/System.Configuration/Configuration.cs b/mcs/class/System.Configuration/System.Configuration/Configuration.cs
index c96f80d4f189efddfa9efc21528500deccabc02f..eb3c14e40c4d0c2800833bd5f68c00ebd9250efa 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/Configuration.cs
+++ b/mcs/class/System.Configuration/System.Configuration/Configuration.cs
@@ -366,7 +366,7 @@ namespace System.Configuration {
                        try {
                                Save (stream, mode, forceUpdateAll);
                                system.Host.WriteCompleted (streamName, true, ctx);
-                       } catch (Exception ex) {
+                       } catch (Exception) {
                                system.Host.WriteCompleted (streamName, false, ctx);
                                throw;
                        } finally {
@@ -382,8 +382,8 @@ namespace System.Configuration {
                public void SaveAs (string filename, ConfigurationSaveMode mode)
                {
                        SaveAs (filename, mode, false);
-               }\r
-\r
+               }
+
                [MonoInternalNote ("Detect if file has changed")]
                public void SaveAs (string filename, ConfigurationSaveMode mode, bool forceUpdateAll)
                {
@@ -445,7 +445,7 @@ namespace System.Configuration {
                        
                        try {
                                stream = system.Host.OpenStreamForRead (streamName);
-                       } catch (Exception e) {
+                       } catch (Exception) {
                                return false;
                        }
 

diff --git a/mcs/class/System.Configuration/System.Configuration/ConfigurationManager.cs b/mcs/class/System.Configuration/System.Configuration/ConfigurationManager.cs
index 639d2ab22e2c2f9486a86bea65c9fcb274526e3a..0d5768e7e36a2ebb8406d65f14fb4a692b58ca59 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/ConfigurationManager.cs
+++ b/mcs/class/System.Configuration/System.Configuration/ConfigurationManager.cs
@@ -119,11 +119,11 @@ namespace System.Configuration {
                        }
 
                        return ConfigurationFactory.Create (typeof(ExeConfigurationHost), map, userLevel);
-               }\r
-\r
-#if TARGET_JVM\r
-               [MonoLimitation ("Supported only when the userLevel parameter is set to ConfigurationUserLevel.None. Other values are not supported because Environment.GetFolderPath method is not implemented.")]\r
-#endif\r
+               }
+
+#if TARGET_JVM
+               [MonoLimitation ("Supported only when the userLevel parameter is set to ConfigurationUserLevel.None. Other values are not supported because Environment.GetFolderPath method is not implemented.")]
+#endif
                public static Configuration OpenExeConfiguration (ConfigurationUserLevel userLevel)
                {
                        return OpenExeConfigurationInternal (userLevel, Assembly.GetEntryAssembly () ?? Assembly.GetCallingAssembly (), null);
@@ -188,7 +188,7 @@ namespace System.Configuration {
                }
 
                /* invoked from System.Web */
-               static IInternalConfigSystem ChangeConfigurationSystem (IInternalConfigSystem newSystem)
+               internal static IInternalConfigSystem ChangeConfigurationSystem (IInternalConfigSystem newSystem)
                {
                        if (newSystem == null)
                                throw new ArgumentNullException ("newSystem");

diff --git a/mcs/class/System.Configuration/System.Configuration/DpapiProtectedConfigurationProvider.cs b/mcs/class/System.Configuration/System.Configuration/DpapiProtectedConfigurationProvider.cs
index 1fae3e2e73121096372029d57d6308fd93e016f8..50a4d0b14e03a2f68c38939a39845166204a6165 100644 (file)
--- a/mcs/class/System.Configuration/System.Configuration/DpapiProtectedConfigurationProvider.cs
+++ b/mcs/class/System.Configuration/System.Configuration/DpapiProtectedConfigurationProvider.cs
@@ -34,19 +34,19 @@ namespace System.Configuration
 {
        public sealed class DpapiProtectedConfigurationProvider: ProtectedConfigurationProvider
        {
-               bool useMachineProtection;\r
+               bool useMachineProtection;
                const string NotSupportedReason = @"DpapiProtectedConfigurationProvider depends on the Microsoft Data
 Protection API, and is unimplemented in Mono.  For portability's sake,
-it is suggested that you use the RsaProtectedConfigurationProvider.";\r
+it is suggested that you use the RsaProtectedConfigurationProvider.";
                [MonoNotSupported (NotSupportedReason)]
                public override XmlNode Decrypt (XmlNode encrypted_node)
-               {\r
+               {
                        throw new NotSupportedException (NotSupportedReason);
-               }\r
-\r
+               }
+
                [MonoNotSupported (NotSupportedReason)]
                public override XmlNode Encrypt (XmlNode node)
-               {\r
+               {
                        throw new NotSupportedException (NotSupportedReason);
                }
 
@@ -57,8 +57,8 @@ it is suggested that you use the RsaProtectedConfigurationProvider.";
 
                        string flag;
 
-                       flag = configurationValues ["useMachineProtection"];\r
-                       if (flag != null && flag.ToLowerInvariant () == "true")\r
+                       flag = configurationValues ["useMachineProtection"];
+                       if (flag != null && flag.ToLowerInvariant () == "true")
                                useMachineProtection = true;
                }