Changeset 78403 in vbox for trunk/src

Timestamp:

May 6, 2019 6:48:00 PM (6 years ago)

Author:

vboxsync

Message:

Main/MediumImpl.cpp: Move those Medium::*Task::executeTask() stub implementations into the class declaration as that is much much easier to read & trace. Removed code for pure virtual base function. Fixed logging warning from previous commit.

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (13 diffs)

trunk/src/VBox/Main/src-server/MediumImpl.cpp

@@ -340 +340 @@
 };
 
-HRESULT Medium::Task::executeTask()
-{
-    return E_NOTIMPL;//ReturnComNotImplemented()
-}
-
 class Medium::CreateBaseTask : public Medium::Task
 {
@@ -364 +359 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskCreateBaseHandler(*this);
+    }
 };
 
@@ -403 +401 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskCreateDiffHandler(*this);
+    }
+
     AutoCaller mTargetCaller;
     bool mfKeepMediumLockList;
@@ -466 +468 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskCloneHandler(*this);
+    }
+
     AutoCaller mTargetCaller;
     AutoCaller mParentCaller;
@@ -501 +507 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskMoveHandler(*this);
+    }
+
     bool mfKeepMediumLockList;
 };
@@ -530 +540 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskCompactHandler(*this);
+    }
+
     bool mfKeepMediumLockList;
 };
@@ -562 +576 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskResizeHandler(*this);
+    }
+
     bool mfKeepMediumLockList;
 };
@@ -590 +608 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskResetHandler(*this);
+    }
+
     bool mfKeepMediumLockList;
 };
@@ -618 +640 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskDeleteHandler(*this);
+    }
+
     bool mfKeepMediumLockList;
 };
@@ -665 +691 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskMergeHandler(*this);
+    }
+
     AutoCaller mTargetCaller;
     AutoCaller mParentForTargetCaller;
@@ -732 +762 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskImportHandler(*this);
+    }
+
     AutoCaller mParentCaller;
     bool mfKeepTargetMediumLockList;
@@ -784 +818 @@
 
 private:
-    HRESULT executeTask();
+    HRESULT executeTask()
+    {
+        return mMedium->i_taskEncryptHandler(*this);
+    }
+
     AutoCaller mParentCaller;
 };
 
-/**
- * Implementation code for the "create base" task.
- */
-HRESULT Medium::CreateBaseTask::executeTask()
-{
-    return mMedium->i_taskCreateBaseHandler(*this);
-}
-
-/**
- * Implementation code for the "create diff" task.
- */
-HRESULT Medium::CreateDiffTask::executeTask()
-{
-    return mMedium->i_taskCreateDiffHandler(*this);
-}
-
-/**
- * Implementation code for the "clone" task.
- */
-HRESULT Medium::CloneTask::executeTask()
-{
-    return mMedium->i_taskCloneHandler(*this);
-}
-
-/**
- * Implementation code for the "move" task.
- */
-HRESULT Medium::MoveTask::executeTask()
-{
-    return mMedium->i_taskMoveHandler(*this);
-}
-
-/**
- * Implementation code for the "compact" task.
- */
-HRESULT Medium::CompactTask::executeTask()
-{
-    return mMedium->i_taskCompactHandler(*this);
-}
-
-/**
- * Implementation code for the "resize" task.
- */
-HRESULT Medium::ResizeTask::executeTask()
-{
-    return mMedium->i_taskResizeHandler(*this);
-}
-
-
-/**
- * Implementation code for the "reset" task.
- */
-HRESULT Medium::ResetTask::executeTask()
-{
-    return mMedium->i_taskResetHandler(*this);
-}
-
-/**
- * Implementation code for the "delete" task.
- */
-HRESULT Medium::DeleteTask::executeTask()
-{
-    return mMedium->i_taskDeleteHandler(*this);
-}
-
-/**
- * Implementation code for the "merge" task.
- */
-HRESULT Medium::MergeTask::executeTask()
-{
-    return mMedium->i_taskMergeHandler(*this);
-}
-
-/**
- * Implementation code for the "import" task.
- */
-HRESULT Medium::ImportTask::executeTask()
-{
-    return mMedium->i_taskImportHandler(*this);
-}
-
-/**
- * Implementation code for the "encrypt" task.
- */
-HRESULT Medium::EncryptTask::executeTask()
-{
-    return mMedium->i_taskEncryptHandler(*this);
-}
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -9633 +9583 @@
         m->pVirtualBox->i_onMediumConfigChanged(this);
 
-    LogFlowFunc(("LEAVE: mrc=%Rhrc\n", mrc));
+    LogFlowFunc(("LEAVE: mrc=%Rhrc\n", (HRESULT)mrc));
     return mrc;
 }