Changeset 62305 in vbox for trunk

Timestamp:

Jul 18, 2016 3:53:55 PM (9 years ago)

Author:

vboxsync

Message:

HostDrivers: On MacOS X use 0 to initialize/assign io_connect_t to
fix -Wnull-conversion

Location:

trunk/src/VBox/HostDrivers

Files:

• Support/SUPLib.cpp (modified) (1 diff)
• Support/darwin/SUPLib-darwin.cpp (modified) (1 diff)
• VBoxUSB/darwin/USBLib-darwin.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -102 +102 @@
     /*.fUnrestricted        = */    true
 #if   defined(RT_OS_DARWIN)
-    ,/* .uConnection        = */    NULL
+    ,/* .uConnection        = */    0
 #elif defined(RT_OS_LINUX)
     ,/* .fSysMadviseWorks   = */    false

trunk/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp

@@ -169 +169 @@
      * instantiated and create a session for this process.
      */
-    io_connect_t Connection = NULL;
+    io_connect_t Connection = 0;
     kr = IOServiceOpen(ServiceObject, mach_task_self(), SUP_DARWIN_IOSERVICE_COOKIE, &Connection);
     IOObjectRelease(ServiceObject);

trunk/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp

@@ -47 +47 @@
 static mach_port_t          g_MasterPort = 0;
 /** The current service connection. */
-static io_connect_t         g_Connection = NULL;
+static io_connect_t         g_Connection = 0;
 
 
@@ -132 +132 @@
         AssertMsgFailed(("%#x\n", kr));
     }
-    g_Connection = NULL;
+    g_Connection = 0;
 
     return VINF_SUCCESS;