Code cleanup

jdomnitz · May 5, 2023 · d761d4d · d761d4d
1 parent bd9992d
commit d761d4d
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 122 deletions.
diff --git a/Browser/Program.cs b/Browser/Program.cs
@@ -1,9 +1,6 @@
 using Makaretu.Dns;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Browser
 {

diff --git a/src/MulticastClient.cs b/src/MulticastClient.cs
@@ -6,7 +6,6 @@
 using System.Net;
 using System.Net.NetworkInformation;
 using System.Net.Sockets;
-using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 
 namespace Makaretu.Dns

diff --git a/src/MulticastService.cs b/src/MulticastService.cs
@@ -38,12 +38,12 @@ public class MulticastService : IResolver, IDisposable
         /// <summary>
         ///   Recently sent messages.
         /// </summary>
-        RecentMessages sentMessages = new RecentMessages();
+        readonly RecentMessages sentMessages = new RecentMessages();
 
         /// <summary>
         ///   Recently received messages.
         /// </summary>
-        RecentMessages receivedMessages = new RecentMessages();
+        readonly RecentMessages receivedMessages = new RecentMessages();
 
         /// <summary>
         ///   The multicast client.
@@ -53,17 +53,17 @@ public class MulticastService : IResolver, IDisposable
         /// <summary>
         ///   Use to send unicast IPv4 answers.
         /// </summary>
-        UdpClient unicastClientIp4 = new UdpClient(AddressFamily.InterNetwork);
+        readonly UdpClient unicastClientIp4 = new UdpClient(AddressFamily.InterNetwork);
 
         /// <summary>
         ///   Use to send unicast IPv6 answers.
         /// </summary>
-        UdpClient unicastClientIp6 = new UdpClient(AddressFamily.InterNetworkV6);
+        readonly UdpClient unicastClientIp6 = new UdpClient(AddressFamily.InterNetworkV6);
 
         /// <summary>
         ///   Function used for listening filtered network interfaces.
         /// </summary>
-        Func<IEnumerable<NetworkInterface>, IEnumerable<NetworkInterface>> networkInterfacesFilter;
+        readonly Func<IEnumerable<NetworkInterface>, IEnumerable<NetworkInterface>> networkInterfacesFilter;
 
         /// <summary>
         ///   Set the default TTLs.
@@ -343,7 +343,7 @@ void FindNetworkInterfaces()
         }
 
         /// <inheritdoc />
-        public Task<Message> ResolveAsync(Message request, CancellationToken cancel = default(CancellationToken))
+        public Task<Message> ResolveAsync(Message request, CancellationToken cancel = default)
         {
             var tsc = new TaskCompletionSource<Message>();
 
@@ -694,6 +694,7 @@ protected virtual void Dispose(bool disposing)
         public void Dispose()
         {
             Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
 #endregion

diff --git a/src/NetworkInterfaceEventArgs.cs b/src/NetworkInterfaceEventArgs.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Net.NetworkInformation;
-using System.Text;
 
 namespace Makaretu.Dns
 {

diff --git a/src/RecentMessages.cs b/src/RecentMessages.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
-using System.Text;
 
 namespace Makaretu.Dns
 {

diff --git a/src/ServiceDiscovery.cs b/src/ServiceDiscovery.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Security.Claims;
 using System.Threading.Tasks;
-using System.Xml.Linq;
 using Common.Logging;
 using Makaretu.Dns.Resolving;
 
@@ -30,7 +28,7 @@ public class ServiceDiscovery : IDisposable
         public static readonly DomainName ServiceName = new DomainName("_services._dns-sd._udp.local");
 
         readonly bool ownsMdns;
-        List<ServiceProfile> profiles = new List<ServiceProfile>();
+        readonly List<ServiceProfile> profiles = new List<ServiceProfile>();
         bool conflict;
 
         /// <summary>
@@ -504,6 +502,7 @@ protected virtual void Dispose(bool disposing)
         public void Dispose()
         {
             Dispose(true);
+            GC.SuppressFinalize(this);
         }
 
         #endregion

diff --git a/src/ServiceInstanceDiscoveryEventArgs.cs b/src/ServiceInstanceDiscoveryEventArgs.cs
@@ -1,9 +1,4 @@
-using Makaretu.Dns;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Makaretu.Dns
+namespace Makaretu.Dns
 {
     /// <summary>
     ///   The event data for <see cref="ServiceDiscovery.ServiceInstanceDiscovered"/>.

diff --git a/src/ServiceInstanceShutdownEventArgs.cs b/src/ServiceInstanceShutdownEventArgs.cs
@@ -1,9 +1,4 @@
-using Makaretu.Dns;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Makaretu.Dns
+namespace Makaretu.Dns
 {
     /// <summary>
     ///   The event data for <see cref="ServiceDiscovery.ServiceInstanceShutdown"/>.

diff --git a/src/ServiceProfile.cs b/src/ServiceProfile.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using System.Net.Sockets;
-using System.Text;
 
 namespace Makaretu.Dns
 {

diff --git a/test/Logging.cs b/test/Logging.cs
@@ -1,11 +1,6 @@
 using Common.Logging;
 using Makaretu.Mdns.Simple;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Makaretu.Mdns
 {

diff --git a/test/RecentMessagesTest.cs b/test/RecentMessagesTest.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;