From: Matt Kotsenas Date: Tue, 11 Aug 2020 20:54:08 +0000 (-0700) Subject: Remove unused locals in System.Net.* (#39575) X-Git-Tag: submit/tizen/20210909.063632~6068 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ead2cd50799ecc523e23f50e50b54d8a30d0aa4f;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Remove unused locals in System.Net.* (#39575) * Remove unused locals in System.Net.HttpListener * Remove unused local in System.Net.Requests * Remove unused locals and methods in System.Net.Security --- diff --git a/src/libraries/System.Net.HttpListener/src/System/Net/Windows/HttpListener.Windows.cs b/src/libraries/System.Net.HttpListener/src/System/Net/Windows/HttpListener.Windows.cs index d92f436..75be134 100644 --- a/src/libraries/System.Net.HttpListener/src/System/Net/Windows/HttpListener.Windows.cs +++ b/src/libraries/System.Net.HttpListener/src/System/Net/Windows/HttpListener.Windows.cs @@ -682,7 +682,6 @@ namespace System.Net stoleBlob = false; // Some things we need right away. Lift them out now while it's convenient. - string verb = Interop.HttpApi.GetVerb(memoryBlob.RequestBlob); string authorizationHeader = Interop.HttpApi.GetKnownHeader(memoryBlob.RequestBlob, (int)HttpRequestHeader.Authorization); ulong connectionId = memoryBlob.RequestBlob->ConnectionId; ulong requestId = memoryBlob.RequestBlob->RequestId; diff --git a/src/libraries/System.Net.HttpListener/src/System/Net/Windows/WebSockets/WebSocketProtocolComponent.cs b/src/libraries/System.Net.HttpListener/src/System/Net/Windows/WebSockets/WebSocketProtocolComponent.cs index a7c24f2..72f9f47 100644 --- a/src/libraries/System.Net.HttpListener/src/System/Net/Windows/WebSockets/WebSocketProtocolComponent.cs +++ b/src/libraries/System.Net.HttpListener/src/System/Net/Windows/WebSockets/WebSocketProtocolComponent.cs @@ -248,7 +248,6 @@ namespace System.Net.WebSockets ThrowOnError(errorCode); - Interop.WebSocket.HttpHeader[] responseHeaders = MarshalHttpHeaders(responseHeadersPtr, (int)responseHeaderCount); errorCode = Interop.WebSocket.WebSocketEndServerHandshake(webSocketHandle); ThrowOnError(errorCode); diff --git a/src/libraries/System.Net.HttpListener/tests/GetContextHelper.cs b/src/libraries/System.Net.HttpListener/tests/GetContextHelper.cs index 5f6586b..440f726 100644 --- a/src/libraries/System.Net.HttpListener/tests/GetContextHelper.cs +++ b/src/libraries/System.Net.HttpListener/tests/GetContextHelper.cs @@ -24,7 +24,7 @@ namespace System.Net.Tests public async Task GetResponse() { // We need to create a mock request to give the HttpListener a context. - Task clientTask = _client.GetStringAsync(_listeningUrl); + _ = _client.GetStringAsync(_listeningUrl); HttpListenerContext context = await _listener.GetContextAsync(); return context.Response; } diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs index 96c5990..51c1e33 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerAuthenticationTests.cs @@ -269,7 +269,7 @@ namespace System.Net.Tests using (var client = new HttpClient()) { - HttpResponseMessage response = await AuthenticationFailure(client, HttpStatusCode.InternalServerError); + await AuthenticationFailure(client, HttpStatusCode.InternalServerError); } } @@ -281,7 +281,7 @@ namespace System.Net.Tests using (var client = new HttpClient()) { - Task clientTask = client.GetStringAsync(_factory.ListeningUrl); + _ = client.GetStringAsync(_factory.ListeningUrl); Assert.Throws(() => _listener.GetContext()); } } @@ -450,7 +450,7 @@ namespace System.Net.Tests Basic, Convert.ToBase64String(Encoding.ASCII.GetBytes(string.Format("{0}:{1}", TestUser, TestPassword)))); - Task clientTask = client.GetStringAsync(_factory.ListeningUrl); + _ = client.GetStringAsync(_factory.ListeningUrl); HttpListenerContext listenerContext = await serverContextTask; Assert.Null(listenerContext.User); @@ -469,7 +469,7 @@ namespace System.Net.Tests Basic, Convert.ToBase64String(Encoding.ASCII.GetBytes(authHeader))); - Task clientTask = client.GetStringAsync(_factory.ListeningUrl); + _ = client.GetStringAsync(_factory.ListeningUrl); HttpListenerContext listenerContext = await serverContextTask; Assert.Equal(expectedUsername, listenerContext.User.Identity.Name); diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs index 5c06f46..964a188 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerContextTests.cs @@ -108,7 +108,6 @@ namespace System.Net.Tests Assert.Equal("user", context.User.Identity.Name); HttpListenerWebSocketContext webSocketContext = await context.AcceptWebSocketAsync(null); - IPrincipal user = webSocketContext.User; // Should be copied as User gets disposed when HttpListenerContext is closed. Assert.NotSame(context.User, webSocketContext.User); diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerPrefixCollectionTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerPrefixCollectionTests.cs index ce7af21..b1f7d3e 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerPrefixCollectionTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerPrefixCollectionTests.cs @@ -272,7 +272,6 @@ namespace System.Net.Tests { using (var factory1 = new HttpListenerFactory(host, path: string.Empty)) { - HttpListener listener1 = factory1.GetListener(); using (var listener2 = new HttpListener()) { string prefixWithSubPath = $"{factory1.ListeningUrl}sub_path/"; diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs index 5b7fd28..dce9cf7 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerResponseTests.cs @@ -410,7 +410,6 @@ namespace System.Net.Tests public async Task CloseResponseEntity_SendToClosedConnection_DoesNotThrow(bool willBlock) { const string Text = "Some-String"; - byte[] buffer = Encoding.UTF8.GetBytes(Text); using (HttpListenerFactory factory = new HttpListenerFactory()) using (Socket client = factory.GetConnectedSocket()) diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerTests.cs index 845eed6..c4ec076 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerTests.cs @@ -148,7 +148,7 @@ namespace System.Net.Tests HttpListener listener = listenerFactory.GetListener(); listener.Start(); - Task clientTask = client.GetStringAsync(listenerFactory.ListeningUrl); + _ = client.GetStringAsync(listenerFactory.ListeningUrl); IAsyncResult beginGetContextResult = listener.BeginGetContext(null, null); listener.EndGetContext(beginGetContextResult); diff --git a/src/libraries/System.Net.HttpListener/tests/HttpListenerTimeoutManagerTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpListenerTimeoutManagerTests.cs index 961dab4..9767c21 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpListenerTimeoutManagerTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpListenerTimeoutManagerTests.cs @@ -369,10 +369,7 @@ namespace System.Net.Tests private unsafe void GetUrlGroupProperty(ulong urlGroupId, HTTP_SERVER_PROPERTY property, IntPtr info, uint infosize) { - uint statusCode = 0; - - statusCode = HttpQueryUrlGroupProperty(urlGroupId, HTTP_SERVER_PROPERTY.HttpServerTimeoutsProperty, info, infosize, IntPtr.Zero); - + uint statusCode = HttpQueryUrlGroupProperty(urlGroupId, HTTP_SERVER_PROPERTY.HttpServerTimeoutsProperty, info, infosize, IntPtr.Zero); if (statusCode != 0) { throw new Exception("HttpQueryUrlGroupProperty failed with " + (int)statusCode); diff --git a/src/libraries/System.Net.HttpListener/tests/HttpResponseStreamTests.cs b/src/libraries/System.Net.HttpListener/tests/HttpResponseStreamTests.cs index f831be2..59bbc82 100644 --- a/src/libraries/System.Net.HttpListener/tests/HttpResponseStreamTests.cs +++ b/src/libraries/System.Net.HttpListener/tests/HttpResponseStreamTests.cs @@ -302,7 +302,7 @@ namespace System.Net.Tests { using (HttpClient client = new HttpClient()) { - Task clientTask = client.GetStringAsync(_factory.ListeningUrl); + _ = client.GetStringAsync(_factory.ListeningUrl); HttpListenerContext serverContext = await _listener.GetContextAsync(); using (HttpListenerResponse response = serverContext.Response) @@ -330,7 +330,7 @@ namespace System.Net.Tests { using (HttpClient client = new HttpClient()) { - Task clientTask = client.GetStringAsync(_factory.ListeningUrl); + _ = client.GetStringAsync(_factory.ListeningUrl); HttpListenerContext serverContext = await _listener.GetContextAsync(); using (HttpListenerResponse response = serverContext.Response) @@ -356,7 +356,7 @@ namespace System.Net.Tests { using (HttpClient client = new HttpClient()) { - Task clientTask = client.GetStringAsync(_factory.ListeningUrl); + _ = client.GetStringAsync(_factory.ListeningUrl); HttpListenerContext serverContext = await _listener.GetContextAsync(); using (HttpListenerResponse response = serverContext.Response) diff --git a/src/libraries/System.Net.Requests/tests/FileWebRequestTest.cs b/src/libraries/System.Net.Requests/tests/FileWebRequestTest.cs index 833e1be..505aa4b 100644 --- a/src/libraries/System.Net.Requests/tests/FileWebRequestTest.cs +++ b/src/libraries/System.Net.Requests/tests/FileWebRequestTest.cs @@ -188,7 +188,6 @@ namespace System.Net.Tests string path = Path.GetTempFileName(); try { - var data = new byte[1024]; WebRequest request = WebRequest.Create("file://" + path); request.Method = WebRequestMethods.File.UploadFile; using (WebResponse response = await GetResponseAsync(request)) diff --git a/src/libraries/System.Net.Requests/tests/FtpWebRequestTest.cs b/src/libraries/System.Net.Requests/tests/FtpWebRequestTest.cs index 7ac66f2..ff43951 100644 --- a/src/libraries/System.Net.Requests/tests/FtpWebRequestTest.cs +++ b/src/libraries/System.Net.Requests/tests/FtpWebRequestTest.cs @@ -61,7 +61,7 @@ namespace System.Net.Tests { string serverUrl = string.Format("ftp://www.{0}.com/", Guid.NewGuid().ToString()); FtpWebRequest request = (FtpWebRequest)WebRequest.Create(serverUrl); - WebException ex = Assert.Throws(() => request.GetResponse()); + Assert.Throws(() => request.GetResponse()); } [OuterLoop] diff --git a/src/libraries/System.Net.Requests/tests/HttpWebRequestTest.cs b/src/libraries/System.Net.Requests/tests/HttpWebRequestTest.cs index 32903ad..e4b24c9 100644 --- a/src/libraries/System.Net.Requests/tests/HttpWebRequestTest.cs +++ b/src/libraries/System.Net.Requests/tests/HttpWebRequestTest.cs @@ -1164,7 +1164,7 @@ namespace System.Net.Tests HttpWebRequest request = HttpWebRequest.CreateHttp(remoteServer); request.Method = "POST"; - IAsyncResult asyncResult = request.BeginGetRequestStream(null, null); + request.BeginGetRequestStream(null, null); Assert.Throws(() => { request.BeginGetRequestStream(null, null); @@ -1178,7 +1178,7 @@ namespace System.Net.Tests { HttpWebRequest request = HttpWebRequest.CreateHttp(url); - IAsyncResult asyncResult = request.BeginGetResponse(null, null); + request.BeginGetResponse(null, null); Assert.Throws(() => { request.BeginGetRequestStream(null, null); @@ -1194,7 +1194,7 @@ namespace System.Net.Tests await LoopbackServer.CreateServerAsync((server, url) => { HttpWebRequest request = WebRequest.CreateHttp(url); - IAsyncResult asyncResult = request.BeginGetResponse(null, null); + request.BeginGetResponse(null, null); Assert.Throws(() => request.BeginGetResponse(null, null)); return Task.FromResult(null); }); @@ -1324,7 +1324,6 @@ namespace System.Net.Tests public void CookieContainer_Count_Add(Uri remoteServer) { HttpWebRequest request = WebRequest.CreateHttp(remoteServer); - DateTime now = DateTime.UtcNow; request.CookieContainer = new CookieContainer(); request.CookieContainer.Add(remoteServer, new Cookie("1", "cookie1")); request.CookieContainer.Add(remoteServer, new Cookie("2", "cookie2")); @@ -1457,7 +1456,6 @@ namespace System.Net.Tests request.ContentType = HeadersPartialContent; using WebResponse response = await GetResponseAsync(request); - string headersString = response.Headers.ToString(); Assert.Equal(HeadersPartialContent, response.Headers[HttpResponseHeader.ContentType]); }, async server => { diff --git a/src/libraries/System.Net.Requests/tests/HttpWebResponseHeaderTest.cs b/src/libraries/System.Net.Requests/tests/HttpWebResponseHeaderTest.cs index bdec87a..6a1ea2e 100644 --- a/src/libraries/System.Net.Requests/tests/HttpWebResponseHeaderTest.cs +++ b/src/libraries/System.Net.Requests/tests/HttpWebResponseHeaderTest.cs @@ -28,8 +28,7 @@ namespace System.Net.Tests request.Method = HttpMethod.Get.Method; HttpContinueDelegate continueDelegate = new HttpContinueDelegate(HttpContinueMethod); request.ContinueDelegate = continueDelegate; - Task getResponse = request.GetResponseAsync(); - DateTimeOffset utcNow = DateTimeOffset.UtcNow; + _ = request.GetResponseAsync(); await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.OK, "Content-Type: application/json;charset=UTF-8\r\n", "12345"); Assert.Equal(continueDelegate, request.ContinueDelegate); }); @@ -44,7 +43,6 @@ namespace System.Net.Tests HttpWebRequest request = WebRequest.CreateHttp(url); request.Method = HttpMethod.Get.Method; Task getResponse = request.GetResponseAsync(); - DateTimeOffset utcNow = DateTimeOffset.UtcNow; await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.OK, "Content-Type: application/json;charset=UTF-8\r\n", "12345"); using (WebResponse response = await getResponse) @@ -71,7 +69,6 @@ namespace System.Net.Tests HttpWebRequest request = WebRequest.CreateHttp(url); request.Method = HttpMethod.Get.Method; Task getResponse = request.GetResponseAsync(); - DateTimeOffset utcNow = DateTimeOffset.UtcNow; await server.AcceptConnectionSendResponseAndCloseAsync(HttpStatusCode.OK, "Content-Type: application/json;charset=UTF-8\r\n", "12345"); WebResponse response = await getResponse; HttpWebResponse httpResponse = (HttpWebResponse)response; @@ -104,7 +101,6 @@ namespace System.Net.Tests [Fact] public async Task LastModified_InvalidDate_Throws() { - DateTime expected = TimeZoneInfo.ConvertTimeFromUtc(new DateTime(2018, 4, 10, 3, 4, 5, DateTimeKind.Utc), TimeZoneInfo.Local); await LoopbackServer.CreateServerAsync(async (server, url) => { HttpWebRequest request = WebRequest.CreateHttp(url); @@ -126,12 +122,10 @@ namespace System.Net.Tests HttpWebRequest request = WebRequest.CreateHttp(url); request.Method = HttpMethod.Get.Method; Task getResponse = request.GetResponseAsync(); - DateTimeOffset utcNow = DateTimeOffset.UtcNow; await server.AcceptConnectionSendResponseAndCloseAsync(); using (WebResponse response = await getResponse) { - HttpWebResponse httpResponse = (HttpWebResponse)response; using (MemoryStream fs = new MemoryStream()) { BinaryFormatter formatter = new BinaryFormatter(); diff --git a/src/libraries/System.Net.Requests/tests/RequestStreamTest.cs b/src/libraries/System.Net.Requests/tests/RequestStreamTest.cs index 9b6ac07..f4f48ff 100644 --- a/src/libraries/System.Net.Requests/tests/RequestStreamTest.cs +++ b/src/libraries/System.Net.Requests/tests/RequestStreamTest.cs @@ -70,7 +70,7 @@ namespace System.Net.Tests { await GetRequestStream((stream) => { - AssertExtensions.Throws("buffer", () => { Task t = stream.WriteAsync(null, 0, 1); }); + AssertExtensions.Throws("buffer", () => { stream.WriteAsync(null, 0, 1); }); }); } @@ -79,7 +79,7 @@ namespace System.Net.Tests { await GetRequestStream((stream) => { - AssertExtensions.Throws("offset", () => { Task t = stream.WriteAsync(buffer, -1, buffer.Length); }); + AssertExtensions.Throws("offset", () => { stream.WriteAsync(buffer, -1, buffer.Length); }); }); } @@ -88,7 +88,7 @@ namespace System.Net.Tests { await GetRequestStream((stream) => { - AssertExtensions.Throws("count", "size", () => { Task t = stream.WriteAsync(buffer, 0, -1); }); + AssertExtensions.Throws("count", "size", () => { stream.WriteAsync(buffer, 0, -1); }); }); } @@ -97,7 +97,7 @@ namespace System.Net.Tests { await GetRequestStream((stream) => { - AssertExtensions.Throws("count", "size", () => { Task t = stream.WriteAsync(buffer, 0, buffer.Length + 1); }); + AssertExtensions.Throws("count", "size", () => { stream.WriteAsync(buffer, 0, buffer.Length + 1); }); }); } @@ -106,7 +106,7 @@ namespace System.Net.Tests { await GetRequestStream((stream) => { - AssertExtensions.Throws("offset", () => { Task t = stream.WriteAsync(buffer, int.MaxValue, int.MaxValue); }); + AssertExtensions.Throws("offset", () => { stream.WriteAsync(buffer, int.MaxValue, int.MaxValue); }); }); } diff --git a/src/libraries/System.Net.Requests/tests/WebRequestTest.cs b/src/libraries/System.Net.Requests/tests/WebRequestTest.cs index e1fc0df..a6746fc 100644 --- a/src/libraries/System.Net.Requests/tests/WebRequestTest.cs +++ b/src/libraries/System.Net.Requests/tests/WebRequestTest.cs @@ -82,7 +82,7 @@ namespace System.Net.Tests public void Create_ValidWebRequestUriScheme_Success(string scheme) { var uri = new Uri($"{scheme}://example.com/folder/resource.txt"); - WebRequest request = WebRequest.Create(uri); + WebRequest.Create(uri); } [Theory] diff --git a/src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.Unix.cs b/src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.Unix.cs index 4b7d9e7..34386ae 100644 --- a/src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.Unix.cs +++ b/src/libraries/System.Net.Security/src/System/Net/CertificateValidationPal.Unix.cs @@ -56,7 +56,7 @@ namespace System.Net SafeFreeCertContext? remoteContext = null; try { - int errorCode = QueryContextRemoteCertificate(securityContext, out remoteContext); + QueryContextRemoteCertificate(securityContext, out remoteContext); if (remoteContext != null && !remoteContext.IsInvalid) { diff --git a/src/libraries/System.Net.Security/src/System/Net/Security/TlsFrameHelper.cs b/src/libraries/System.Net.Security/src/System/Net/Security/TlsFrameHelper.cs index 7140fea..29fc55a 100644 --- a/src/libraries/System.Net.Security/src/System/Net/Security/TlsFrameHelper.cs +++ b/src/libraries/System.Net.Security/src/System/Net/Security/TlsFrameHelper.cs @@ -561,7 +561,6 @@ namespace System.Net.Security } // Following can underflow but it is ok due to equality check below - int hostNameStructLength = BinaryPrimitives.ReadUInt16BigEndian(serverName) - sizeof(NameType); NameType nameType = (NameType)serverName[NameTypeOffset]; ReadOnlySpan hostNameStruct = serverName.Slice(HostNameStructOffset); if (nameType != NameType.HostName) diff --git a/src/libraries/System.Net.Security/tests/UnitTests/Fakes/FakeSslStream.Implementation.cs b/src/libraries/System.Net.Security/tests/UnitTests/Fakes/FakeSslStream.Implementation.cs index 7139118..9b74d71 100644 --- a/src/libraries/System.Net.Security/tests/UnitTests/Fakes/FakeSslStream.Implementation.cs +++ b/src/libraries/System.Net.Security/tests/UnitTests/Fakes/FakeSslStream.Implementation.cs @@ -49,22 +49,8 @@ namespace System.Net.Security private ValueTask ReadAsyncInternal(TReadAdapter adapter, Memory buffer) => default; - private Task CheckEnqueueWriteAsync() => default; - - private void CheckEnqueueWrite() - { - } - - private ValueTask CheckEnqueueReadAsync(Memory buffer) => default; - - private int CheckEnqueueRead(Memory buffer) => default; - private bool RemoteCertRequired => default; - private void CheckThrow(bool authSuccessCheck, bool shutdownCheck = false) - { - } - private void CloseInternal() { }