Changeset 63470 in vbox

Timestamp:

Aug 15, 2016 12:07:31 PM (8 years ago)

Author:

vboxsync

Message:

HBDMgmt-darwin.cpp: DECLCALLBACK should not be used for OS X callback, only VBox/IPRT ones!

File:

• trunk/src/VBox/Devices/Storage/HBDMgmt-darwin.cpp (modified) (6 diffs)

trunk/src/VBox/Devices/Storage/HBDMgmt-darwin.cpp

@@ -201 +201 @@
 
 /**
- * Callback notifying us that the async DADiskClaim()/DADiskUnmount call has completed.
+ * Implements the OS X callback DADiskClaimCallback.
+ *
+ * This notifies us that the async DADiskClaim()/DADiskUnmount call has
+ * completed.
  *
  * @param   hDiskRef         The disk that was attempted claimed / unmounted.
@@ -207 +210 @@
  * @param   pvContext        Pointer to the return code variable.
  */
-static DECLCALLBACK(void) hbdMgrDACallbackComplete(DADiskRef hDiskRef, DADissenterRef hDissenterRef, void *pvContext)
-{
+static void hbdMgrDACallbackComplete(DADiskRef hDiskRef, DADissenterRef hDissenterRef, void *pvContext)
+{
+    RT_NOREF(hDiskRef);
     PHBDMGRDACLBKARGS pArgs = (PHBDMGRDACLBKARGS)pvContext;
     pArgs->pszErrDetail = NULL;
@@ -231 +235 @@
 
 /**
- * Callback notifying us about any attempt to mount a volume. If we claimed the volume
- * or the complete disk containing the volume we will deny the attempt.
+ * Implements the OS X callback DADiskMountApprovalCallback.
+ *
+ * This notifies us about any attempt to mount a volume.  If we claimed the
+ * volume or the complete disk containing the volume we will deny the attempt.
  *
  * @returns Reference to a DADissenter object which contains the result.
@@ -238 +244 @@
  * @param   pvCOntext        Pointer to the block device manager.
  */
-static DECLCALLBACK(DADissenterRef) hbdMgrDAMountApprovalCallback(DADiskRef hDiskRef, void *pvContext)
+static DADissenterRef hbdMgrDAMountApprovalCallback(DADiskRef hDiskRef, void *pvContext)
 {
     PHBDMGRINT pThis = (PHBDMGRINT)pvContext;
@@ -275 +281 @@
 
 /**
+ * Implements OS X callback CFRunLoopSourceContext::perform.
+ *
  * Dummy handler for the wakeup source to kick the worker thread.
  *
@@ -280 +288 @@
  * @param   pInfo            Opaque user data given during source creation, unused.
  */
-static DECLCALLBACK(void) hbdMgrDAPerformWakeup(void *pInfo)
-{
-    return;
+static void hbdMgrDAPerformWakeup(void *pInfo)
+{
+    RT_NOREF(pInfo);
 }