Changeset 98352 in vbox for trunk/src/VBox/Main/src-server/MachineImplMoveVM.cpp

Timestamp:

Jan 30, 2023 7:44:51 PM (23 months ago)

Author:

vboxsync

Message:

Main: Fix identifiers containing an incorrect plural of "medium".

File:

• trunk/src/VBox/Main/src-server/MachineImplMoveVM.cpp (modified) (11 diffs)

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

@@ -321 +321 @@
     ULONG uTotalWeight = 1;
 
-    /* The lists m_llMedias, m_llSaveStateFiles and m_llNVRAMFiles are filled in the queryMediasForAllStates() */
-    hrc = queryMediasForAllStates();
+    /* The lists m_llMedia, m_llSaveStateFiles and m_llNVRAMFiles are filled in the queryMediaForAllStates() */
+    hrc = queryMediaForAllStates();
     if (FAILED(hrc))
         return hrc;
 
-    /* Calculate the total size of images. Fill m_finalMediumsMap */
+    /* Calculate the total size of images. Fill m_finalMediaMap */
     { /** The scope here for better reading, apart from that the variables have limited scope too */
-        uint64_t totalMediumsSize = 0;
-
-        for (size_t i = 0; i < m_llMedias.size(); ++i)
-        {
-            MEDIUMTASKCHAINMOVE &mtc = m_llMedias.at(i);
+        uint64_t totalMediaSize = 0;
+
+        for (size_t i = 0; i < m_llMedia.size(); ++i)
+        {
+            MEDIUMTASKCHAINMOVE &mtc = m_llMedia.at(i);
             for (size_t a = mtc.chain.size(); a > 0; --a)
             {
@@ -353 +353 @@
 
                     std::pair<std::map<Utf8Str, MEDIUMTASKMOVE>::iterator,bool> ret;
-                    ret = m_finalMediumsMap.insert(std::make_pair(name, mtc.chain[a - 1]));
+                    ret = m_finalMediaMap.insert(std::make_pair(name, mtc.chain[a - 1]));
                     if (ret.second == true)
                     {
@@ -359 +359 @@
                         ++uCount;
                         uTotalWeight += mtc.chain[a - 1].uWeight;
-                        totalMediumsSize += (uint64_t)cbSize;
+                        totalMediaSize += (uint64_t)cbSize;
                         Log2(("Image %s was added into the moved list\n", name.c_str()));
                     }
@@ -366 +366 @@
         }
 
-        Log2(("Total Size of images is %lld bytes\n", totalMediumsSize));
-        neededFreeSpace += totalMediumsSize;
+        Log2(("Total Size of images is %lld bytes\n", totalMediaSize));
+        neededFreeSpace += totalMediaSize;
     }
 
@@ -666 +666 @@
     {
         /* Move all disks */
-        hrc = taskMoveVM->moveAllDisks(taskMoveVM->m_finalMediumsMap, strTargetFolder);
+        hrc = taskMoveVM->moveAllDisks(taskMoveVM->m_finalMediaMap, strTargetFolder);
         if (FAILED(hrc))
             throw hrc;
@@ -1008 +1008 @@
                 taskMoveVM->m_pProgress->SetNextOperation(BstrFmt(tr("Skip the empty operation %d..."), i + 1).raw(), 1);
 
-            hrc = taskMoveVM->moveAllDisks(taskMoveVM->m_finalMediumsMap);
+            hrc = taskMoveVM->moveAllDisks(taskMoveVM->m_finalMediaMap);
             if (FAILED(hrc))
                 throw hrc;
@@ -1098 +1098 @@
          * because we doubled the number of operations for rollback case.
          * But if we want to update the progress object corectly it's needed to add all medium moved by standard
-         * "move medium" logic (for us it's taskMoveVM->m_finalMediumsMap) to the current number of operation.
+         * "move medium" logic (for us it's taskMoveVM->m_finalMediaMap) to the current number of operation.
          */
 
@@ -1106 +1106 @@
         hrc = taskMoveVM->m_pProgress->COMGETTER(Operation)(&operation);
 
-        for (ULONG i = operation; i < operation + taskMoveVM->m_finalMediumsMap.size() - 1; ++i)
+        for (ULONG i = operation; i < operation + taskMoveVM->m_finalMediaMap.size() - 1; ++i)
             taskMoveVM->m_pProgress->SetNextOperation(BstrFmt(tr("Skip the empty operation %d..."), i).raw(), 1);
 
@@ -1436 +1436 @@
 }
 
-HRESULT MachineMoveVM::queryMediasForAllStates()
+HRESULT MachineMoveVM::queryMediaForAllStates()
 {
     /* In this case we create a exact copy of the original VM. This means just
@@ -1525 +1525 @@
             }
 
-            m_llMedias.append(mtc);
+            m_llMedia.append(mtc);
         }
 
@@ -1540 +1540 @@
      * that in the previous loop, cause there we go from child -> parent and
      * didn't know how many are between. */
-    for (size_t i = 0; i < m_llMedias.size(); ++i)
+    for (size_t i = 0; i < m_llMedia.size(); ++i)
     {
         uint32_t uIdx = 0;
-        MEDIUMTASKCHAINMOVE &mtc = m_llMedias.at(i);
+        MEDIUMTASKCHAINMOVE &mtc = m_llMedia.at(i);
         for (size_t a = mtc.chain.size(); a > 0; --a)
             mtc.chain[a - 1].uIdx = uIdx++;