Skip to content

Commit 1fda180

Browse files
authored
Remove some extra static arrays used in Split() (dotnet#76003)
* Remove some extra static arrays used in Split * Remove const
1 parent 561b097 commit 1fda180

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

src/libraries/System.Net.Mail/src/System/Net/Mime/MimeBasePart.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ internal static string EncodeHeaderValue(string value, Encoding? encoding, bool
4343
}
4444

4545
private static readonly char[] s_headerValueSplitChars = new char[] { '\r', '\n', ' ' };
46-
private static readonly char[] s_questionMarkSplitChars = new char[] { '?' };
4746

4847
internal static string DecodeHeaderValue(string? value)
4948
{
@@ -65,7 +64,7 @@ internal static string DecodeHeaderValue(string? value)
6564
//the third is the unicode encoding type, and the fourth is encoded message itself. '?' is not valid inside of
6665
//an encoded string other than as a separator for these five parts.
6766
//If this check fails, the string is either not encoded or cannot be decoded by this method
68-
string[] subStrings = foldedSubString.Split(s_questionMarkSplitChars);
67+
string[] subStrings = foldedSubString.Split('?');
6968
if ((subStrings.Length != 5 || subStrings[0] != "=" || subStrings[4] != "="))
7069
{
7170
return value;

src/libraries/System.Net.NetworkInformation/src/System/Net/NetworkInformation/StringParsingHelpers.Connections.cs

+6-8
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ namespace System.Net.NetworkInformation
99
{
1010
internal static partial class StringParsingHelpers
1111
{
12-
private static readonly string[] s_newLineSeparator = new string[] { Environment.NewLine }; // Used for string splitting
13-
1412
internal static int ParseNumSocketConnections(string filePath, string protocolName)
1513
{
1614
// Parse the number of active connections out of /proc/net/sockstat
@@ -32,7 +30,7 @@ internal static TcpConnectionInformation[] ParseActiveTcpConnectionsFromFiles(st
3230
if (tcp4ConnectionsFile != null)
3331
{
3432
string tcp4FileContents = ReadAllText(tcp4ConnectionsFile);
35-
v4connections = tcp4FileContents.Split(s_newLineSeparator, StringSplitOptions.RemoveEmptyEntries);
33+
v4connections = tcp4FileContents.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries);
3634
}
3735
else
3836
{
@@ -42,7 +40,7 @@ internal static TcpConnectionInformation[] ParseActiveTcpConnectionsFromFiles(st
4240
if (tcp6ConnectionsFile != null)
4341
{
4442
string tcp6FileContents = ReadAllText(tcp6ConnectionsFile);
45-
v6connections = tcp6FileContents.Split(s_newLineSeparator, StringSplitOptions.RemoveEmptyEntries);
43+
v6connections = tcp6FileContents.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries);
4644
}
4745
else
4846
{
@@ -112,7 +110,7 @@ internal static IPEndPoint[] ParseActiveTcpListenersFromFiles(string? tcp4Connec
112110
if (tcp4ConnectionsFile != null)
113111
{
114112
string tcp4FileContents = ReadAllText(tcp4ConnectionsFile);
115-
v4connections = tcp4FileContents.Split(s_newLineSeparator, StringSplitOptions.RemoveEmptyEntries);
113+
v4connections = tcp4FileContents.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries);
116114
}
117115
else
118116
{
@@ -122,7 +120,7 @@ internal static IPEndPoint[] ParseActiveTcpListenersFromFiles(string? tcp4Connec
122120
if (tcp6ConnectionsFile != null)
123121
{
124122
string tcp6FileContents = ReadAllText(tcp6ConnectionsFile);
125-
v6connections = tcp6FileContents.Split(s_newLineSeparator, StringSplitOptions.RemoveEmptyEntries);
123+
v6connections = tcp6FileContents.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries);
126124
}
127125
else
128126
{
@@ -192,7 +190,7 @@ public static IPEndPoint[] ParseActiveUdpListenersFromFiles(string? udp4File, st
192190
if (udp4File != null)
193191
{
194192
string udp4FileContents = ReadAllText(udp4File);
195-
v4connections = udp4FileContents.Split(s_newLineSeparator, StringSplitOptions.RemoveEmptyEntries);
193+
v4connections = udp4FileContents.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries);
196194
}
197195
else
198196
{
@@ -202,7 +200,7 @@ public static IPEndPoint[] ParseActiveUdpListenersFromFiles(string? udp4File, st
202200
if (udp6File != null)
203201
{
204202
string udp6FileContents = ReadAllText(udp6File);
205-
v6connections = udp6FileContents.Split(s_newLineSeparator, StringSplitOptions.RemoveEmptyEntries);
203+
v6connections = udp6FileContents.Split(Environment.NewLine, StringSplitOptions.RemoveEmptyEntries);
206204
}
207205
else
208206
{

0 commit comments

Comments
 (0)