Changeset 97314 in vbox for trunk/src/VBox/Frontends

Timestamp:

Oct 26, 2022 6:47:49 PM (2 years ago)

Author:

vboxsync

Message:

Frontends/VBoxManage: 'VBoxManage internalcommands createrawvmdk' no
longer works after the implementation was moved to the API as part of
xTracker #9224.

Follow-up build fix to address a left-behind orphaned function
(appendPartDesc()) whose only caller in VBoxInternalManage.cpp was
removed (flagged as 'defined but not used' by [-Werror=unused-function]).
Also, avoid assigning a size_t to an int which is flagged as 'possible
loss of data' by the Windows compiler.

bugref:9224 ticketref:21125

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp

@@ -1282 +1282 @@
 }
 
-static PVDISKRAWPARTDESC appendPartDesc(uint32_t *pcPartDescs, PVDISKRAWPARTDESC *ppPartDescs)
-{
-    (*pcPartDescs)++;
-    PVDISKRAWPARTDESC p;
-    p = (PVDISKRAWPARTDESC)RTMemRealloc(*ppPartDescs,
-                                          *pcPartDescs * sizeof(VDISKRAWPARTDESC));
-    *ppPartDescs = p;
-    if (p)
-    {
-        p = p + *pcPartDescs - 1;
-        memset(p, '\0', sizeof(VDISKRAWPARTDESC));
-    }
-
-    return p;
-}
-
 static const RTGETOPTDEF g_aCreateRawVMDKOptions[] =
 {
@@ -1368 +1352 @@
     if (!papszNewArgv)
             return RTMsgErrorExit(RTEXITCODE_FAILURE, Internal::tr("Failed to allocate memory for argument array"));
-    size_t cArgs = 0;
+    int cArgs = 0;
 
     papszNewArgv[cArgs++] = RTStrDup("disk");
@@ -1374 +1358 @@
     papszNewArgv[cArgs++] = RTStrDup("--format=VMDK");
 
-    for (size_t i = 0; i < cArgs; i++)
+    for (int i = 0; i < cArgs; i++)
         if (!papszNewArgv[i])
             return RTMsgErrorExit(RTEXITCODE_FAILURE, Internal::tr("Failed to allocate memory for argument array"));
@@ -1396 +1380 @@
     RTEXITCODE rcExit = handleCreateMedium(a);
 
-    for (size_t i = 0; i < cArgs; i++)
+    for (int i = 0; i < cArgs; i++)
         RTStrFree(papszNewArgv[i]);
     RTMemFree(papszNewArgv);