Changeset 61231 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

May 27, 2016 9:09:18 AM (9 years ago)

Author:

vboxsync

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

107520

Message:

DrvHostBase: warnings/fixes on darwin

File:

• trunk/src/VBox/Devices/Storage/DrvHostBase.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Storage/DrvHostBase.cpp

@@ -814 +814 @@
      */
     CFMutableDictionaryRef RefMatchingDict = IOServiceMatching("IOCDBlockStorageDevice");
-    AssertReturn(RefMatchingDict, NULL);
+    AssertReturn(RefMatchingDict, VERR_NOT_FOUND);
 
     /*
@@ -821 +821 @@
     io_iterator_t DVDServices = NULL;
     IOReturn irc = IOServiceGetMatchingServices(pThis->MasterPort, RefMatchingDict, &DVDServices);
-    AssertMsgReturn(irc == kIOReturnSuccess, ("irc=%d\n", irc), NULL);
+    AssertMsgReturn(irc == kIOReturnSuccess, ("irc=%d\n", irc), VERR_NOT_FOUND);
     RefMatchingDict = NULL; /* the reference is consumed by IOServiceGetMatchingServices. */
 
@@ -1795 +1795 @@
     {
         mach_port_deallocate(mach_task_self(), pThis->MasterPort);
-        pThis->MasterPort = NULL;
+        pThis->MasterPort = 0;
     }
     if (pThis->pDASession)