Changeset 98287 in vbox for trunk/src/VBox/Main/src-server/darwin/iokit.cpp

Timestamp:

Jan 24, 2023 1:40:47 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

155492

Message:

Main/iokit.cpp: DarwinSubscribeUSBNotifications was missing a return code check in the last IOServiceAddMatchingNotification call. shouldn't break anything, but you know... rc->hrc/vrc/krc. bugref:10223

File:

• trunk/src/VBox/Main/src-server/darwin/iokit.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/darwin/iokit.cpp

@@ -126 +126 @@
         /* Get the darwin version we are running on. */
         char szVersion[64];
-        int rc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, &szVersion[0], sizeof(szVersion));
-        if (RT_SUCCESS(rc))
-        {
-            rc = RTStrToUInt32Ex(&szVersion[0], NULL, 10, &g_uMajorDarwin);
-            AssertLogRelMsg(rc == VINF_SUCCESS || rc == VWRN_TRAILING_CHARS,
+        int vrc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, &szVersion[0], sizeof(szVersion));
+        if (RT_SUCCESS(vrc))
+        {
+            vrc = RTStrToUInt32Ex(&szVersion[0], NULL, 10, &g_uMajorDarwin);
+            AssertLogRelMsg(vrc == VINF_SUCCESS || vrc == VWRN_TRAILING_CHARS,
                             ("Failed to convert the major part of the version string '%s' into an integer: %Rrc\n",
-                             szVersion, rc));
+                             szVersion, vrc));
         }
         else
-            AssertLogRelMsgFailed(("Failed to query the OS release version with %Rrc\n", rc));
+            AssertLogRelMsgFailed(("Failed to query the OS release version with %Rrc\n", vrc));
     }
     return true;
@@ -659 +659 @@
              * Create the notification callbacks.
              */
-            kern_return_t rc = IOServiceAddMatchingNotification(pNotify->NotifyPort,
-                                                                kIOPublishNotification,
-                                                                IOServiceMatching(kIOUSBDeviceClassName),
-                                                                darwinUSBAttachNotification1,
-                                                                pNotify,
-                                                                &pNotify->AttachIterator);
-            if (rc == KERN_SUCCESS)
+            kern_return_t krc = IOServiceAddMatchingNotification(pNotify->NotifyPort,
+                                                                 kIOPublishNotification,
+                                                                 IOServiceMatching(kIOUSBDeviceClassName),
+                                                                 darwinUSBAttachNotification1,
+                                                                 pNotify,
+                                                                 &pNotify->AttachIterator);
+            if (krc == KERN_SUCCESS)
             {
                 darwinDrainIterator(pNotify->AttachIterator);
-                rc = IOServiceAddMatchingNotification(pNotify->NotifyPort,
-                                                      kIOMatchedNotification,
-                                                      IOServiceMatching(kIOUSBDeviceClassName),
-                                                      darwinUSBAttachNotification2,
-                                                      pNotify,
-                                                      &pNotify->AttachIterator2);
-                if (rc == KERN_SUCCESS)
+                krc = IOServiceAddMatchingNotification(pNotify->NotifyPort,
+                                                       kIOMatchedNotification,
+                                                       IOServiceMatching(kIOUSBDeviceClassName),
+                                                       darwinUSBAttachNotification2,
+                                                       pNotify,
+                                                       &pNotify->AttachIterator2);
+                if (krc == KERN_SUCCESS)
                 {
                     darwinDrainIterator(pNotify->AttachIterator2);
-                    rc = IOServiceAddMatchingNotification(pNotify->NotifyPort,
-                                                          kIOTerminatedNotification,
-                                                          IOServiceMatching(kIOUSBDeviceClassName),
-                                                          darwinUSBDetachNotification,
-                                                          pNotify,
-                                                          &pNotify->DetachIterator);
+                    krc = IOServiceAddMatchingNotification(pNotify->NotifyPort,
+                                                           kIOTerminatedNotification,
+                                                           IOServiceMatching(kIOUSBDeviceClassName),
+                                                           darwinUSBDetachNotification,
+                                                           pNotify,
+                                                           &pNotify->DetachIterator);
+                    if (krc == KERN_SUCCESS)
                     {
                         darwinDrainIterator(pNotify->DetachIterator);