Changeset 59436 in vbox

Timestamp:

Jan 22, 2016 1:58:58 PM (9 years ago)

Author:

vboxsync

Message:

iokit.cpp: Nits, try use IO_OBJECT_NULL.

File:

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

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

@@ -48 +48 @@
 #include <iprt/process.h>
 #include <iprt/assert.h>
+#include <iprt/system.h>
 #include <iprt/thread.h>
 #include <iprt/uuid.h>
-#include <iprt/system.h>
 #ifdef STANDALONE_TESTCASE
 # include <iprt/initterm.h>
@@ -85 +85 @@
 #define VBOX_OSX_EL_CAPTIAN_VER 15
 
+
 /*********************************************************************************************************************************
 *   Global Variables                                                                                                             *
@@ -91 +92 @@
 static mach_port_t g_MasterPort = NULL;
 /** Major darwin version as returned by uname -r. */
-uint32_t g_uMajorDarwin = 0;
+static uint32_t g_uMajorDarwin = 0;
 
 
@@ -107 +108 @@
 
         /* Get the darwin version we are running on. */
-        char aszVersion[16] = { 0 };
-        int rc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, &aszVersion[0], sizeof(aszVersion));
+        char szVersion[64];
+        int rc = RTSystemQueryOSInfo(RTSYSOSINFO_RELEASE, &szVersion[0], sizeof(szVersion));
         if (RT_SUCCESS(rc))
         {
-            /* Make sure it is zero terminated (paranoia). */
-            aszVersion[15] = '\0';
-            rc = RTStrToUInt32Ex(&aszVersion[0], NULL, 10, &g_uMajorDarwin);
-            if (   rc != VINF_SUCCESS
-                && rc != VWRN_TRAILING_CHARS)
-                LogRel(("IOKit: Failed to convert the major part of the version string \"%s\" into an integer\n", &aszVersion[0]));
+            rc = RTStrToUInt32Ex(&szVersion[0], NULL, 10, &g_uMajorDarwin);
+            AssertLogRelMsg(rc == VINF_SUCCESS || rc == VWRN_TRAILING_CHARS,
+                            ("Failed to convert the major part of the version string '%s' into an integer: %Rrc\n",
+                             szVersion, rc));
         }
         else
-            LogRel(("IOKit: Failed to query the OS release version with %Rrc\n", rc));
+            AssertLogRelMsgFailed(("Failed to query the OS release version with %Rrc\n", rc));
     }
     return true;
@@ -498 +497 @@
     {
         io_object_t Child;
-        while ((Child = IOIteratorNext(Children)))
+        while ((Child = IOIteratorNext(Children)) != IO_OBJECT_NULL)
         {
             darwinDumpObjInt(Child, cIndents + 4);
@@ -555 +554 @@
 {
     io_object_t Object;
-    while ((Object = IOIteratorNext(pIterator)))
+    while ((Object = IOIteratorNext(pIterator)) != IO_OBJECT_NULL)
     {
         DARWIN_IOKIT_DUMP_OBJ(Object);
@@ -730 +729 @@
         return NULL;
     io_object_t Child;
-    while ((Child = IOIteratorNext(Children)))
+    while ((Child = IOIteratorNext(Children)) != IO_OBJECT_NULL)
     {
         krc = IOObjectGetClass(Child, pszNameBuf);
@@ -788 +787 @@
 }
 
+
 /**
  * Finds the matching IOUSBHostDevice registry entry for the given legacy USB device interface (IOUSBDevice).
@@ -825 +825 @@
      */
     io_object_t USBDevice;
-    while ((USBDevice = IOIteratorNext(USBDevices)) != 0)
+    while ((USBDevice = IOIteratorNext(USBDevices)) != IO_OBJECT_NULL)
     {
         DARWIN_IOKIT_DUMP_OBJ(USBDevice);
@@ -851 +851 @@
 }
 
+
 static bool darwinUSBDeviceIsGrabbedDetermineState(PUSBDEVICE pCur, io_object_t USBDevice)
 {
@@ -866 +867 @@
     RTPROCESS Client = NIL_RTPROCESS;
     io_object_t Interface;
-    while ((Interface = IOIteratorNext(Interfaces)) != 0)
+    while ((Interface = IOIteratorNext(Interfaces)) != IO_OBJECT_NULL)
     {
         io_name_t szName;
@@ -903 +904 @@
 }
 
+
 /**
  * Worker for determining the USB device state for devices which are not captured by the VBoxUSB driver
@@ -926 +928 @@
     bool fSeizable = true;
     io_object_t Interface;
-    while ((Interface = IOIteratorNext(Interfaces)) != 0)
+    while ((Interface = IOIteratorNext(Interfaces)) != IO_OBJECT_NULL)
     {
         io_name_t szName;
@@ -945 +947 @@
             {
                 io_object_t Child1;
-                while ((Child1 = IOIteratorNext(Children1)) != 0)
+                while ((Child1 = IOIteratorNext(Children1)) != IO_OBJECT_NULL)
                 {
                     krc = IOObjectGetClass(Child1, szName);
@@ -995 +997 @@
 }
 
+
 /**
  * Worker function for DarwinGetUSBDevices() that tries to figure out
@@ -1029 +1032 @@
         if (g_uMajorDarwin >= VBOX_OSX_EL_CAPTIAN_VER)
         {
-            io_object_t IOUSBDeviceNew = 0;
-
+            io_object_t IOUSBDeviceNew = IO_OBJECT_NULL;
             io_object_t krc = darwinGetUSBHostDeviceFromLegacyDevice(USBDevice, &IOUSBDeviceNew);
             if (   krc == KERN_SUCCESS
-                && IOUSBDeviceNew != 0)
+                && IOUSBDeviceNew != IO_OBJECT_NULL)
             {
                 darwinDetermineUSBDeviceStateWorker(pCur, IOUSBDeviceNew);
@@ -1077 +1079 @@
     unsigned i = 0;
     io_object_t USBDevice;
-    while ((USBDevice = IOIteratorNext(USBDevices)) != 0)
+    while ((USBDevice = IOIteratorNext(USBDevices)) != IO_OBJECT_NULL)
     {
         DARWIN_IOKIT_DUMP_OBJ(USBDevice);
@@ -1335 +1337 @@
     unsigned cMatches = 0;
     io_object_t USBDevice;
-    while ((USBDevice = IOIteratorNext(USBDevices)))
+    while ((USBDevice = IOIteratorNext(USBDevices)) != IO_OBJECT_NULL)
     {
         cMatches++;
@@ -1477 +1479 @@
     unsigned i = 0;
     io_object_t DVDService;
-    while ((DVDService = IOIteratorNext(DVDServices)) != 0)
+    while ((DVDService = IOIteratorNext(DVDServices)) != IO_OBJECT_NULL)
     {
         DARWIN_IOKIT_DUMP_OBJ(DVDService);
@@ -1633 +1635 @@
     PDARWINETHERNIC pTail = NULL;
     io_object_t EtherIfService;
-    while ((EtherIfService = IOIteratorNext(EtherIfServices)) != 0)
+    while ((EtherIfService = IOIteratorNext(EtherIfServices)) != IO_OBJECT_NULL)
     {
         /*