Remove useless assignment to locals

xtqqczze · xtqqczze · commit ba6abe67db97 · 2020-12-09T17:03:49.000Z
Follow-up to PowerShell#14341.
diff --git a/src/Microsoft.PowerShell.Security/security/AclCommands.cs b/src/Microsoft.PowerShell.Security/security/AclCommands.cs
@@ -385,8 +385,7 @@ public static SecurityIdentifier GetCentralAccessPolicyId(PSObject instance)
                     return null;
                 }
 
-                NativeMethods.ACL sacl = new NativeMethods.ACL();
-                sacl = Marshal.PtrToStructure<NativeMethods.ACL>(pSacl);
+                NativeMethods.ACL sacl = Marshal.PtrToStructure<NativeMethods.ACL>(pSacl);
                 if (sacl.AceCount == 0)
                 {
                     return null;
@@ -396,8 +395,7 @@ public static SecurityIdentifier GetCentralAccessPolicyId(PSObject instance)
                 IntPtr pAce = pSacl + Marshal.SizeOf(new NativeMethods.ACL());
                 for (ushort aceIdx = 0; aceIdx < sacl.AceCount; aceIdx++)
                 {
-                    NativeMethods.ACE_HEADER ace = new NativeMethods.ACE_HEADER();
-                    ace = Marshal.PtrToStructure<NativeMethods.ACE_HEADER>(pAce);
+                    NativeMethods.ACE_HEADER ace = Marshal.PtrToStructure<NativeMethods.ACE_HEADER>(pAce);
                     Dbg.Diagnostics.Assert(ace.AceType ==
                         NativeMethods.SYSTEM_SCOPED_POLICY_ID_ACE_TYPE,
                         "Unexpected ACE type: " + ace.AceType.ToString(CultureInfo.CurrentCulture));
@@ -475,8 +473,7 @@ public static string GetCentralAccessPolicyName(PSObject instance)
                 }
 
                 // Get the CAP name.
-                NativeMethods.CENTRAL_ACCESS_POLICY cap = new NativeMethods.CENTRAL_ACCESS_POLICY();
-                cap = Marshal.PtrToStructure<NativeMethods.CENTRAL_ACCESS_POLICY>(caps);
+                NativeMethods.CENTRAL_ACCESS_POLICY cap = Marshal.PtrToStructure<NativeMethods.CENTRAL_ACCESS_POLICY>(caps);
                 // LSA_UNICODE_STRING is composed of WCHARs, but its length is given in bytes.
                 return Marshal.PtrToStringUni(cap.Name.Buffer, cap.Name.Length / 2);
             }
@@ -528,7 +525,7 @@ public static string[] GetAllCentralAccessPolicies(PSObject instance)
 
                 // Add CAP names and IDs to a string array.
                 string[] policies = new string[capCount];
-                NativeMethods.CENTRAL_ACCESS_POLICY cap = new NativeMethods.CENTRAL_ACCESS_POLICY();
+                NativeMethods.CENTRAL_ACCESS_POLICY cap;
                 IntPtr capPtr = caps;
                 for (uint capIdx = 0; capIdx < capCount; capIdx++)
                 {
@@ -1144,7 +1141,7 @@ private IntPtr GetSaclWithCapId(string capStr)
                     }
 
                     // Find the supplied string among available CAP names, use the corresponding CAPID.
-                    NativeMethods.CENTRAL_ACCESS_POLICY cap = new NativeMethods.CENTRAL_ACCESS_POLICY();
+                    NativeMethods.CENTRAL_ACCESS_POLICY cap;
                     IntPtr capPtr = caps;
                     for (uint capIdx = 0; capIdx < capCount; capIdx++)
                     {

Original file line number	Diff line number	Diff line change
`@@ -385,8 +385,7 @@ public static SecurityIdentifier GetCentralAccessPolicyId(PSObject instance)`
`385`	`385`	`return null;`
`386`	`386`	`}`
`387`	`387`
`388`		`- NativeMethods.ACL sacl = new NativeMethods.ACL();`
`389`		`- sacl = Marshal.PtrToStructure<NativeMethods.ACL>(pSacl);`
	`388`	`+ NativeMethods.ACL sacl = Marshal.PtrToStructure<NativeMethods.ACL>(pSacl);`
`390`	`389`	`if (sacl.AceCount == 0)`
`391`	`390`	`{`
`392`	`391`	`return null;`
`@@ -396,8 +395,7 @@ public static SecurityIdentifier GetCentralAccessPolicyId(PSObject instance)`
`396`	`395`	`IntPtr pAce = pSacl + Marshal.SizeOf(new NativeMethods.ACL());`
`397`	`396`	`for (ushort aceIdx = 0; aceIdx < sacl.AceCount; aceIdx++)`
`398`	`397`	`{`
`399`		`- NativeMethods.ACE_HEADER ace = new NativeMethods.ACE_HEADER();`
`400`		`- ace = Marshal.PtrToStructure<NativeMethods.ACE_HEADER>(pAce);`
	`398`	`+ NativeMethods.ACE_HEADER ace = Marshal.PtrToStructure<NativeMethods.ACE_HEADER>(pAce);`
`401`	`399`	`Dbg.Diagnostics.Assert(ace.AceType ==`
`402`	`400`	`NativeMethods.SYSTEM_SCOPED_POLICY_ID_ACE_TYPE,`
`403`	`401`	`"Unexpected ACE type: " + ace.AceType.ToString(CultureInfo.CurrentCulture));`
`@@ -475,8 +473,7 @@ public static string GetCentralAccessPolicyName(PSObject instance)`
`475`	`473`	`}`
`476`	`474`
`477`	`475`	`// Get the CAP name.`
`478`		`- NativeMethods.CENTRAL_ACCESS_POLICY cap = new NativeMethods.CENTRAL_ACCESS_POLICY();`
`479`		`- cap = Marshal.PtrToStructure<NativeMethods.CENTRAL_ACCESS_POLICY>(caps);`
	`476`	`+ NativeMethods.CENTRAL_ACCESS_POLICY cap = Marshal.PtrToStructure<NativeMethods.CENTRAL_ACCESS_POLICY>(caps);`
`480`	`477`	`// LSA_UNICODE_STRING is composed of WCHARs, but its length is given in bytes.`
`481`	`478`	`return Marshal.PtrToStringUni(cap.Name.Buffer, cap.Name.Length / 2);`
`482`	`479`	`}`
`@@ -528,7 +525,7 @@ public static string[] GetAllCentralAccessPolicies(PSObject instance)`
`528`	`525`
`529`	`526`	`// Add CAP names and IDs to a string array.`
`530`	`527`	`string[] policies = new string[capCount];`
`531`		`- NativeMethods.CENTRAL_ACCESS_POLICY cap = new NativeMethods.CENTRAL_ACCESS_POLICY();`
	`528`	`+ NativeMethods.CENTRAL_ACCESS_POLICY cap;`
`532`	`529`	`IntPtr capPtr = caps;`
`533`	`530`	`for (uint capIdx = 0; capIdx < capCount; capIdx++)`
`534`	`531`	`{`
`@@ -1144,7 +1141,7 @@ private IntPtr GetSaclWithCapId(string capStr)`
`1144`	`1141`	`}`
`1145`	`1142`
`1146`	`1143`	`// Find the supplied string among available CAP names, use the corresponding CAPID.`
`1147`		`- NativeMethods.CENTRAL_ACCESS_POLICY cap = new NativeMethods.CENTRAL_ACCESS_POLICY();`
	`1144`	`+ NativeMethods.CENTRAL_ACCESS_POLICY cap;`
`1148`	`1145`	`IntPtr capPtr = caps;`
`1149`	`1146`	`for (uint capIdx = 0; capIdx < capCount; capIdx++)`
`1150`	`1147`	`{`