From bebfe95de85c1f11cafebff1efa61b3ef029aa21 Mon Sep 17 00:00:00 2001 From: eriawan Date: Sun, 6 Oct 2024 03:14:31 +0700 Subject: [PATCH] Set additional Encoding param to be nullable and refactor ValidateArgsAndOpenPath to not require Encoding param anymore like StreamWriter --- .../System.Private.CoreLib/src/System/IO/StreamReader.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/IO/StreamReader.cs b/src/libraries/System.Private.CoreLib/src/System/IO/StreamReader.cs index c611fb95c3d59f..cd3bc29187abdb 100644 --- a/src/libraries/System.Private.CoreLib/src/System/IO/StreamReader.cs +++ b/src/libraries/System.Private.CoreLib/src/System/IO/StreamReader.cs @@ -198,7 +198,7 @@ public StreamReader(string path, Encoding? encoding, bool detectEncodingFromByte } public StreamReader(string path, Encoding? encoding, bool detectEncodingFromByteOrderMarks, int bufferSize) - : this(ValidateArgsAndOpenPath(path, encoding, bufferSize), encoding, detectEncodingFromByteOrderMarks, bufferSize, leaveOpen: false) + : this(ValidateArgsAndOpenPath(path, bufferSize), encoding, detectEncodingFromByteOrderMarks, bufferSize, leaveOpen: false) { } @@ -224,10 +224,9 @@ private static FileStream ValidateArgsAndOpenPath(string path, FileStreamOptions return new FileStream(path, options); } - private static FileStream ValidateArgsAndOpenPath(string path, Encoding encoding, int bufferSize) + private static FileStream ValidateArgsAndOpenPath(string path, int bufferSize) { ArgumentException.ThrowIfNullOrEmpty(path); - ArgumentNullException.ThrowIfNull(encoding); ArgumentOutOfRangeException.ThrowIfNegativeOrZero(bufferSize); return new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, DefaultFileStreamBufferSize);