Changeset 63811 in vbox

Timestamp:

Sep 13, 2016 11:33:47 AM (8 years ago)

Author:

vboxsync

Message:

Storage: Cleanup, let vdIfIoIntFileSetAllocationSize take a progress interface instead of just pfnProgress and pvUser

Location:

trunk/src/VBox/Storage

Files:

• QED.cpp (modified) (1 diff)
• RAW.cpp (modified) (1 diff)
• VD.cpp (modified) (3 diffs)
• VDI.cpp (modified) (1 diff)
• VHD.cpp (modified) (1 diff)
• VMDK.cpp (modified) (1 diff)

trunk/src/VBox/Storage/QED.cpp

@@ -1593 +1593 @@
         }
 
-        if RT_FAILURE(rc)
+        if (RT_FAILURE(rc))
             RTMemFree(pImage);
     }

trunk/src/VBox/Storage/RAW.cpp

@@ -256 +256 @@
                 {
                     rc = vdIfIoIntFileSetAllocationSize(pImage->pIfIo, pImage->pStorage, cbSize, 0 /* fFlags */,
-                                                        pIfProgress ? pIfProgress->pfnProgress : NULL,
-                                                        pIfProgress ? pIfProgress->Core.pvUser : NULL,
-                                                        uPercentStart, uPercentSpan);
+                                                        pIfProgress, uPercentStart, uPercentSpan);
                     if (RT_SUCCESS(rc))
                     {

trunk/src/VBox/Storage/VD.cpp

@@ -4670 +4670 @@
 static DECLCALLBACK(int) vdIOIntSetAllocationSize(void *pvUser, PVDIOSTORAGE pIoStorage,
                                                   uint64_t cbSize, uint32_t fFlags,
-                                                  PFNVDPROGRESS pfnProgress,
-                                                  void *pvUserProgess, unsigned uPercentStart,
-                                                  unsigned uPercentSpan)
+                                                  PVDINTERFACEPROGRESS pIfProgress,
+                                                  unsigned uPercentStart, unsigned uPercentSpan)
 {
     PVDIO pVDIo = (PVDIO)pvUser;
@@ -4707 +4706 @@
                             uOff += cbChunk;
 
-                            if (pfnProgress)
-                                rc = pfnProgress(pvUserProgess, uPercentStart + uOff * uPercentSpan / cbFill);
+                            rc = vdIfProgress(pIfProgress, uPercentStart + uOff * uPercentSpan / cbFill);
                         }
                     }
@@ -4723 +4721 @@
     }
 
-    if (RT_SUCCESS(rc) && pfnProgress)
-        rc = pfnProgress(pvUserProgess, uPercentStart + uPercentSpan);
+    if (RT_SUCCESS(rc))
+        rc = vdIfProgress(pIfProgress, uPercentStart + uPercentSpan);
 
     return rc;

trunk/src/VBox/Storage/VDI.cpp

@@ -610 +610 @@
              */
             rc = vdIfIoIntFileSetAllocationSize(pImage->pIfIo, pImage->pStorage, cbTotal, 0 /* fFlags */,
-                                                pIfProgress ? pIfProgress->pfnProgress : NULL,
-                                                pIfProgress ? pIfProgress->Core.pvUser : NULL,
-                                                uPercentStart, uPercentSpan);
+                                                pIfProgress, uPercentStart, uPercentSpan);
             pImage->cbImage = cbTotal;
         }

trunk/src/VBox/Storage/VHD.cpp

@@ -1166 +1166 @@
             pImage->uCurrentEndOfFile = cbSize;
             rc = vdIfIoIntFileSetAllocationSize(pImage->pIfIo, pImage->pStorage, pImage->uCurrentEndOfFile + sizeof(VHDFooter),
-                                                0 /* fFlags */, pIfProgress->pfnProgress, pIfProgress->Core.pvUser,
+                                                0 /* fFlags */, pIfProgress,
                                                 uPercentStart, uPercentSpan);
             if (RT_FAILURE(rc))

trunk/src/VBox/Storage/VMDK.cpp

@@ -3618 +3618 @@
         {
             rc = vdIfIoIntFileSetAllocationSize(pImage->pIfIo, pExtent->pFile->pStorage, cbExtent,
-                                                0 /* fFlags */, pIfProgress->pfnProgress, pIfProgress->Core.pvUser,
+                                                0 /* fFlags */, pIfProgress,
                                                 uPercentStart + cbOffset * uPercentSpan / cbSize,
                                                 cbExtent * uPercentSpan / cbSize);