Skip to content

Avoid unnecessary StringCollection allocation #15832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjmholt merged 1 commit into from
Jul 27, 2021
Merged

Avoid unnecessary StringCollection allocation #15832

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 23 additions & 17 deletions src/System.Management.Automation/FormatAndOutput/common/BaseOutputtingCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Management.Automation;
using System.Management.Automation.Internal;

Expand Down Expand Up @@ -1117,33 +1116,40 @@ private void InternalInitialize(ListViewEntry lve)

internal static string[] GetProperties(ListViewEntry lve)
{
StringCollection props = new StringCollection();
foreach (ListViewField lvf in lve.listViewFieldList)
int count = lve.listViewFieldList.Count;

if (count == 0)
{
props.Add(lvf.label ?? lvf.propertyName);
return null;
}

if (props.Count == 0)
return null;
string[] retVal = new string[props.Count];
props.CopyTo(retVal, 0);
return retVal;
string[] result = new string[count];
for (int index = 0; index < result.Length; ++index)
{
ListViewField lvf = lve.listViewFieldList[index];
result[index] = lvf.label ?? lvf.propertyName;
}

return result;
}

internal static string[] GetValues(ListViewEntry lve)
{
StringCollection vals = new StringCollection();
int count = lve.listViewFieldList.Count;

foreach (ListViewField lvf in lve.listViewFieldList)
if (count == 0)
{
vals.Add(lvf.formatPropertyField.propertyValue);
return null;
}

if (vals.Count == 0)
return null;
string[] retVal = new string[vals.Count];
vals.CopyTo(retVal, 0);
return retVal;
string[] result = new string[count];
for (int index = 0; index < result.Length; ++index)
{
ListViewField lvf = lve.listViewFieldList[index];
result[index] = lvf.formatPropertyField.propertyValue;
}

return result;
}

/// <summary>
Expand Down