Fix CA1822: Mark members as static part 2 (#14225)

xtqqczze · web-flow · commit 4ab1b90d0856 · 2020-11-24T12:05:34.000+05:00
https://docs.microsoft.com/dotnet/fundamentals/code-analysis/quality-rules/ca1822
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/GetEventCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/GetEventCommand.cs
@@ -1346,7 +1346,7 @@ private string BuildStructuredQueryFromHashTable(EventLogSession eventLogSession
         // HandleEventIdHashValue helper for hashtable structured query builder.
         // Constructs and returns EventId XPath portion as a string.
         //
-        private string HandleEventIdHashValue(object value)
+        private static string HandleEventIdHashValue(object value)
         {
             StringBuilder ret = new();
             Array idsArray = value as Array;
@@ -1376,7 +1376,7 @@ private string HandleEventIdHashValue(object value)
         // HandleLevelHashValue helper for hashtable structured query builder.
         // Constructs and returns Level XPath portion as a string.
         //
-        private string HandleLevelHashValue(object value)
+        private static string HandleLevelHashValue(object value)
         {
             StringBuilder ret = new();
             Array levelsArray = value as Array;
@@ -1564,7 +1564,7 @@ private string HandleEndTimeHashValue(object value, Hashtable hash)
         // HandleDataHashValue helper for hashtable structured query builder.
         // Constructs and returns EventData/Data XPath portion as a string.
         //
-        private string HandleDataHashValue(object value)
+        private static string HandleDataHashValue(object value)
         {
             StringBuilder ret = new();
             Array dataArray = value as Array;
@@ -1595,7 +1595,7 @@ private string HandleDataHashValue(object value)
         // Constructs and returns named event data field XPath portion as a string.
         // Fix Issue #2327
         //
-        private string HandleNamedDataHashValue(string key, object value)
+        private static string HandleNamedDataHashValue(string key, object value)
         {
             StringBuilder ret = new();
             Array dataArray = value as Array;
@@ -1909,7 +1909,7 @@ private string AddProviderPredicatesToFilter(StringCollection providers)
         // "System/Provider[@Name='a' or @Name='b']"
         // for all provider names specified in the "providers" argument.
         //
-        private string BuildProvidersPredicate(StringCollection providers)
+        private static string BuildProvidersPredicate(StringCollection providers)
         {
             if (providers.Count == 0)
             {
diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/PdhHelper.cs
@@ -429,7 +429,7 @@ public void Dispose()
         /// <param name="strNative"></param>
         /// <param name="strSize"></param>
         /// <param name="strColl"></param>
-        private void ReadPdhMultiString(ref IntPtr strNative, Int32 strSize, ref StringCollection strColl)
+        private static void ReadPdhMultiString(ref IntPtr strNative, Int32 strSize, ref StringCollection strColl)
         {
             Debug.Assert(strSize >= 2);
             int offset = 0;
@@ -452,7 +452,7 @@ private void ReadPdhMultiString(ref IntPtr strNative, Int32 strSize, ref StringC
             strColl.AddRange(allSubstringsWithNulls.Split('\0'));
         }
 
-        private uint GetCounterInfoPlus(IntPtr hCounter, out UInt32 counterType, out UInt32 defaultScale, out UInt64 timeBase)
+        private static uint GetCounterInfoPlus(IntPtr hCounter, out UInt32 counterType, out UInt32 defaultScale, out UInt64 timeBase)
         {
             counterType = 0;
             defaultScale = 0;
@@ -824,7 +824,7 @@ public bool IsPathValid(string path)
             return (PdhValidatePathEx(_hDataSource, path) == PdhResults.PDH_CSTATUS_VALID_DATA);
         }
 
-        private uint MakePath(PDH_COUNTER_PATH_ELEMENTS pathElts, out string outPath, bool bWildcardInstances)
+        private static uint MakePath(PDH_COUNTER_PATH_ELEMENTS pathElts, out string outPath, bool bWildcardInstances)
         {
             outPath = string.Empty;
             IntPtr pPathBufferSize = new(0);
@@ -861,7 +861,7 @@ private uint MakePath(PDH_COUNTER_PATH_ELEMENTS pathElts, out string outPath, bo
             return res;
         }
 
-        private uint MakeAllInstancePath(string origPath, out string unifiedPath)
+        private static uint MakeAllInstancePath(string origPath, out string unifiedPath)
         {
             unifiedPath = origPath;
 
@@ -876,7 +876,7 @@ private uint MakeAllInstancePath(string origPath, out string unifiedPath)
             return MakePath(elts, out unifiedPath, true);
         }
 
-        private uint ParsePath(string fullPath, ref PDH_COUNTER_PATH_ELEMENTS pCounterPathElements)
+        private static uint ParsePath(string fullPath, ref PDH_COUNTER_PATH_ELEMENTS pCounterPathElements)
         {
             IntPtr bufSize = new(0);
 

Original file line number	Diff line number	Diff line change
`@@ -429,7 +429,7 @@ public void Dispose()`
`429`	`429`	`/// <param name="strNative"></param>`
`430`	`430`	`/// <param name="strSize"></param>`
`431`	`431`	`/// <param name="strColl"></param>`
`432`		`- private void ReadPdhMultiString(ref IntPtr strNative, Int32 strSize, ref StringCollection strColl)`
	`432`	`+ private static void ReadPdhMultiString(ref IntPtr strNative, Int32 strSize, ref StringCollection strColl)`
`433`	`433`	`{`
`434`	`434`	`Debug.Assert(strSize >= 2);`
`435`	`435`	`int offset = 0;`
`@@ -452,7 +452,7 @@ private void ReadPdhMultiString(ref IntPtr strNative, Int32 strSize, ref StringC`
`452`	`452`	`strColl.AddRange(allSubstringsWithNulls.Split('\0'));`
`453`	`453`	`}`
`454`	`454`
`455`		`- private uint GetCounterInfoPlus(IntPtr hCounter, out UInt32 counterType, out UInt32 defaultScale, out UInt64 timeBase)`
	`455`	`+ private static uint GetCounterInfoPlus(IntPtr hCounter, out UInt32 counterType, out UInt32 defaultScale, out UInt64 timeBase)`
`456`	`456`	`{`
`457`	`457`	`counterType = 0;`
`458`	`458`	`defaultScale = 0;`
`@@ -824,7 +824,7 @@ public bool IsPathValid(string path)`
`824`	`824`	`return (PdhValidatePathEx(_hDataSource, path) == PdhResults.PDH_CSTATUS_VALID_DATA);`
`825`	`825`	`}`
`826`	`826`
`827`		`- private uint MakePath(PDH_COUNTER_PATH_ELEMENTS pathElts, out string outPath, bool bWildcardInstances)`
	`827`	`+ private static uint MakePath(PDH_COUNTER_PATH_ELEMENTS pathElts, out string outPath, bool bWildcardInstances)`
`828`	`828`	`{`
`829`	`829`	`outPath = string.Empty;`
`830`	`830`	`IntPtr pPathBufferSize = new(0);`
`@@ -861,7 +861,7 @@ private uint MakePath(PDH_COUNTER_PATH_ELEMENTS pathElts, out string outPath, bo`
`861`	`861`	`return res;`
`862`	`862`	`}`
`863`	`863`
`864`		`- private uint MakeAllInstancePath(string origPath, out string unifiedPath)`
	`864`	`+ private static uint MakeAllInstancePath(string origPath, out string unifiedPath)`
`865`	`865`	`{`
`866`	`866`	`unifiedPath = origPath;`
`867`	`867`
`@@ -876,7 +876,7 @@ private uint MakeAllInstancePath(string origPath, out string unifiedPath)`
`876`	`876`	`return MakePath(elts, out unifiedPath, true);`
`877`	`877`	`}`
`878`	`878`
`879`		`- private uint ParsePath(string fullPath, ref PDH_COUNTER_PATH_ELEMENTS pCounterPathElements)`
	`879`	`+ private static uint ParsePath(string fullPath, ref PDH_COUNTER_PATH_ELEMENTS pCounterPathElements)`
`880`	`880`	`{`
`881`	`881`	`IntPtr bufSize = new(0);`
`882`	`882`