Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

mcs/class/System/System.Diagnostics/CounterSample.cs

@@ -125,34 +125,34 @@ namespace System.Diagnostics {
 			return CounterSampleCalculator.ComputeCounterValue (counterSample, nextCounterSample);
 		}
 
-		public override bool Equals (object obj)
+		public override bool Equals (object o)
 		{
-			if (!(obj is CounterSample))
+			if (!(o is CounterSample))
 				return false;
-			return Equals ((CounterSample) obj);
+			return Equals ((CounterSample) o);
 		}
 
-		public bool Equals (CounterSample other)
+		public bool Equals (CounterSample sample)
 		{
 			return
-				rawValue == other.rawValue &&
-				baseValue == other.counterFrequency &&
-				counterFrequency == other.counterFrequency &&
-				systemFrequency == other.systemFrequency &&
-				timeStamp == other.timeStamp &&
-				timeStamp100nSec == other.timeStamp100nSec &&
-				counterTimeStamp == other.counterTimeStamp &&
-				counterType == other.counterType;
+				rawValue == sample.rawValue &&
+				baseValue == sample.counterFrequency &&
+				counterFrequency == sample.counterFrequency &&
+				systemFrequency == sample.systemFrequency &&
+				timeStamp == sample.timeStamp &&
+				timeStamp100nSec == sample.timeStamp100nSec &&
+				counterTimeStamp == sample.counterTimeStamp &&
+				counterType == sample.counterType;
 		}
 
-		public static bool operator == (CounterSample obj1, CounterSample obj2)
+		public static bool operator == (CounterSample a, CounterSample b)
 		{
-			return obj1.Equals (obj2);
+			return a.Equals (b);
 		}
 
-		public static bool operator != (CounterSample obj1, CounterSample obj2)
+		public static bool operator != (CounterSample a, CounterSample b)
 		{
-			return !obj1.Equals (obj2);
+			return !a.Equals (b);
 		}
 
 		public override int GetHashCode ()

mcs/class/System/System.Diagnostics/EventLogEntryCollection.cs

@@ -60,10 +60,10 @@ namespace System.Diagnostics {
 			get { return this; }
 		}
 
-		public void CopyTo (EventLogEntry[] eventLogEntries, int index)
+		public void CopyTo (EventLogEntry[] entries, int index)
 		{
-			EventLogEntry[] entries = _impl.GetEntries ();
-			Array.Copy (entries, 0, eventLogEntries, index, entries.Length);
+			EventLogEntry[] evLogEntries = _impl.GetEntries ();
+			Array.Copy (evLogEntries, 0, entries, index, evLogEntries.Length);
 		}
 
 		public IEnumerator GetEnumerator ()

mcs/class/System/System.Diagnostics/EventLogTraceListener.cs

@@ -95,11 +95,11 @@ namespace System.Diagnostics
 
 		[ComVisible (false)]
 		public override void TraceData (TraceEventCache eventCache,
-						string source, TraceEventType eventType,
+						string source, TraceEventType severity,
 						int id, object data)
 		{
 			EventLogEntryType type;
-			switch (eventType) {
+			switch (severity) {
 			case TraceEventType.Critical:
 			case TraceEventType.Error:
 				type = EventLogEntryType.Error;
@@ -116,7 +116,7 @@ namespace System.Diagnostics
 
 		[ComVisible (false)]
 		public override void TraceData (TraceEventCache eventCache,
-						string source, TraceEventType eventType,
+						string source, TraceEventType severity,
 						int id, params object [] data)
 		{
 			string s = String.Empty;
@@ -126,23 +126,23 @@ namespace System.Diagnostics
 					arr [i] = data [i] != null ? data [i].ToString () : String.Empty;
 				s = String.Join (", ", arr);
 			}
-			TraceData (eventCache, source, eventType, id, s);
+			TraceData (eventCache, source, severity, id, s);
 		}
 
 		[ComVisible (false)]
 		public override void TraceEvent (TraceEventCache eventCache,
-						 string source, TraceEventType eventType,
+						 string source, TraceEventType severity,
 						 int id, string message)
 		{
-			TraceData (eventCache, source, eventType, id, message);
+			TraceData (eventCache, source, severity, id, message);
 		}
 
 		[ComVisible (false)]
 		public override void TraceEvent (TraceEventCache eventCache,
-						 string source, TraceEventType eventType,
+						 string source, TraceEventType severity,
 						 int id, string format, params object [] args)
 		{
-			TraceEvent (eventCache, source, eventType, id, format != null ? String.Format (format, args) : null);
+			TraceEvent (eventCache, source, severity, id, format != null ? String.Format (format, args) : null);
 		}
 	}
 }

mcs/class/System/System.Diagnostics/Process.cs

@@ -331,9 +331,9 @@ namespace System.Diagnostics
 
 						process_name = ProcessName_internal (handle);
 
-						/* If process_name is _still_ null, assume the process has exited */
+						/* If process_name is _still_ null, assume the process has exited or is inaccessible */
 						if (process_name == null)
-							throw new InvalidOperationException ("Process has exited, so the requested information is not available.");
+							throw new InvalidOperationException ("Process has exited or is inaccessible, so the requested information is not available.");
 
 						/* Strip the suffix (if it exists) simplistically instead of removing
 						 * any trailing \.???, so we dont get stupid results on sane systems */
@@ -849,13 +849,13 @@ namespace System.Diagnostics
 		}
 
 		[Obsolete ("Process.Start is not supported on the current platform.", true)]
-		public static Process Start(string fileName, string username, SecureString password, string domain)
+		public static Process Start(string fileName, string userName, SecureString password, string domain)
 		{
 			throw new PlatformNotSupportedException ("Process.Start is not supported on the current platform.");
 		}
 
 		[Obsolete ("Process.Start is not supported on the current platform.", true)]
-		public static Process Start(string fileName, string arguments, string username, SecureString password, string domain)
+		public static Process Start(string fileName, string arguments, string userName, SecureString password, string domain)
 		{
 			throw new PlatformNotSupportedException ("Process.Start is not supported on the current platform.");
 		}