Revert name change of logger instance

Yubico · Aug 13, 2024 · 2dbc4a3 · 2dbc4a3
1 parent 8bb3072
commit 2dbc4a3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/Yubico.Core/src/Yubico/Core/Devices/Hid/MacOSHidDevice.cs b/Yubico.Core/src/Yubico/Core/Devices/Hid/MacOSHidDevice.cs
@@ -49,8 +49,8 @@ public MacOSHidDevice(long entryId) :
         /// </returns>
         public static IEnumerable<HidDevice> GetList()
         {
-            ILogger logger = Logging.Log.GetLogger(typeof(MacOSHidDevice).FullName!);
-            using IDisposable? logScope = logger.BeginScope("MacOSHidDevice.GetList()");
+            ILogger log = Logging.Log.GetLogger(typeof(MacOSHidDevice).FullName!);
+            using IDisposable? logScope = log.BeginScope("MacOSHidDevice.GetList()");
 
             IntPtr manager = IntPtr.Zero;
             IntPtr deviceSet = IntPtr.Zero;
@@ -63,7 +63,7 @@ public static IEnumerable<HidDevice> GetList()
                 deviceSet = IOHIDManagerCopyDevices(manager);
 
                 long deviceSetCount = CFSetGetCount(deviceSet);
-                logger.LogInformation("Found {DeviceCount} HID devices in this device set.", deviceSetCount);
+                log.LogInformation("Found {DeviceCount} HID devices in this device set.", deviceSetCount);
 
                 var devices = new IntPtr[deviceSetCount];
 
@@ -84,13 +84,13 @@ public static IEnumerable<HidDevice> GetList()
             {
                 if (manager != IntPtr.Zero)
                 {
-                    logger.LogInformation("IOHIDManager released.");
+                    log.LogInformation("IOHIDManager released.");
                     CFRelease(manager);
                 }
 
                 if (deviceSet != IntPtr.Zero)
                 {
-                    logger.LogInformation("HID device set released.");
+                    log.LogInformation("HID device set released.");
                     CFRelease(deviceSet);
                 }
             }
@@ -116,11 +116,11 @@ public override IHidConnection ConnectToIOReports() =>
 
         internal static long GetEntryId(IntPtr device)
         {
-            ILogger Logger = Logging.Log.GetLogger(typeof(MacOSHidDevice).FullName!);
+            ILogger log = Logging.Log.GetLogger(typeof(MacOSHidDevice).FullName!);
 
             int service = IOHIDDeviceGetService(device);
             kern_return_t result = IORegistryEntryGetRegistryEntryID(service, out long entryId);
-            Logger.IOKitApiCall(nameof(IORegistryEntryGetRegistryEntryID), result);
+            log.IOKitApiCall(nameof(IORegistryEntryGetRegistryEntryID), result);
 
             if (result != kern_return_t.KERN_SUCCESS)
             {

diff --git a/Yubico.YubiKey/src/Yubico/YubiKey/FidoDeviceInfoFactory.cs b/Yubico.YubiKey/src/Yubico/YubiKey/FidoDeviceInfoFactory.cs
@@ -16,7 +16,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.Logging;
 using Yubico.Core.Devices.Hid;
-using Yubico.Core.Logging;
 using Yubico.YubiKey.DeviceExtensions;
 using Yubico.YubiKey.Fido2.Commands;
 using Yubico.YubiKey.U2f.Commands;
@@ -69,7 +68,6 @@ private static bool TryGetDeviceInfoFromFido(
             IHidDevice device,
             [MaybeNullWhen(returnValue: false)] out YubiKeyDeviceInfo deviceInfo)
         {
-
             try
             {
                 Log.LogInformation("Attempting to read device info via the FIDO interface management command.");