Changeset 87851 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Feb 23, 2021 5:29:34 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

142916

Message:

VBoxManage/showvminfo: Fix forgotten change in r120461, and catch this in the future with Assert.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (13 diffs)

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

@@ -568 +568 @@
     do \
     { \
+        Assert(a_pszHuman[strlen(a_pszHuman) - 1] == ':'); \
         if (details == VMINFO_MACHINEREADABLE) \
             outputMachineReadableString(a_pszMachine, a_fValue ? "on" : "off"); \
@@ -580 +581 @@
     do \
     { \
+        Assert(a_pszHuman[strlen(a_pszHuman) - 1] == ':'); \
         if (details == VMINFO_MACHINEREADABLE) \
             RTPrintf("%s=%u\n", a_pszMachine, a_uValue); \
@@ -589 +591 @@
     do \
     { \
+        Assert(a_pszHuman[strlen(a_pszHuman) - 1] == ':'); \
         if (details == VMINFO_MACHINEREADABLE) \
             RTPrintf("%s=%lld\n", a_pszMachine, a_llValue); \
@@ -601 +604 @@
     do \
     { \
+        Assert(a_pszHuman[strlen(a_pszHuman) - 1] == ':'); \
         BOOL f; \
         CHECK_ERROR2I_RET(a_pObj, COMGETTER(a_Prop)(&f), hrcCheck); \
@@ -612 +616 @@
     do \
     { \
+        Assert(a_pszHuman[strlen(a_pszHuman) - 1] == ':'); \
         BOOL f; \
         CHECK_ERROR2I_RET(a_pObj, a_Invocation, hrcCheck); \
@@ -623 +628 @@
     do \
     { \
+        Assert(a_pszHuman[strlen(a_pszHuman) - 1] == ':'); \
         Bstr bstr; \
         CHECK_ERROR2I_RET(a_pObj, COMGETTER(a_Prop)(bstr.asOutParam()), hrcCheck); \
@@ -634 +640 @@
     do \
     { \
+        Assert(a_pszHuman[strlen(a_pszHuman) - 1] == ':'); \
         Bstr bstr; \
         CHECK_ERROR2I_RET(a_pObj, COMGETTER(a_Prop)(bstr.asOutParam()), hrcCheck); \
@@ -650 +657 @@
     do \
     { \
+        Assert(a_pszHuman[strlen(a_pszHuman) - 1] == ':'); \
         Bstr bstr; \
         CHECK_ERROR2I_RET(a_pObj, COMGETTER(a_Prop)(bstr.asOutParam()), hrcCheck); \
@@ -664 +672 @@
     do \
     { \
+        Assert(a_pszHuman[strlen(a_pszHuman) - 1] == ':'); \
         SafeArray<BSTR> array; \
         CHECK_ERROR2I_RET(a_pObj, COMGETTER(a_Prop)(ComSafeArrayAsOutParam(array)), hrcCheck); \
@@ -686 +695 @@
     do \
     { \
+        Assert(a_pszHuman[strlen(a_pszHuman) - 1] == ':'); \
         USHORT u16 = 0; \
         CHECK_ERROR2I_RET(a_pObj, COMGETTER(a_Prop)(&u16), hrcCheck); \
@@ -697 +707 @@
     do \
     { \
+        Assert(a_pszHuman[strlen(a_pszHuman) - 1] == ':'); \
         ULONG u32 = 0; \
         CHECK_ERROR2I_RET(a_pObj, COMGETTER(a_Prop)(&u32), hrcCheck); \
@@ -708 +719 @@
     do \
     { \
+        Assert(a_pszHuman[strlen(a_pszHuman) - 1] == ':'); \
         LONG64 i64 = 0; \
         CHECK_ERROR2I_RET(a_pObj, COMGETTER(a_Prop)(&i64), hrcCheck); \
@@ -788 +800 @@
     SHOW_STRING_PROP(      machine, LogFolder,                  "LogFldr",              "Log folder:");
     SHOW_UUID_PROP(        machine, HardwareUUID,               "hardwareuuid",         "Hardware UUID:");
-    SHOW_ULONG_PROP(       machine, MemorySize,                 "memory",               "Memory size",      "MB");
+    SHOW_ULONG_PROP(       machine, MemorySize,                 "memory",               "Memory size:",     "MB");
     SHOW_BOOLEAN_PROP(     machine, PageFusionEnabled,          "pagefusion",           "Page Fusion:");
     ComPtr<IGraphicsAdapter> pGraphicsAdapter;
     machine->COMGETTER(GraphicsAdapter)(pGraphicsAdapter.asOutParam());
-    SHOW_ULONG_PROP(pGraphicsAdapter, VRAMSize,                 "vram",                 "VRAM size:",        "MB");
-    SHOW_ULONG_PROP(       machine, CPUExecutionCap,            "cpuexecutioncap",      "CPU exec cap:",     "%");
+    SHOW_ULONG_PROP(pGraphicsAdapter, VRAMSize,                 "vram",                 "VRAM size:",       "MB");
+    SHOW_ULONG_PROP(       machine, CPUExecutionCap,            "cpuexecutioncap",      "CPU exec cap:",    "%");
     SHOW_BOOLEAN_PROP(     machine, HPETEnabled,                "hpet",                 "HPET:");
-    SHOW_STRING_PROP_MAJ(  machine, CPUProfile,                 "cpu-profile",          "CPUProfile:",       "host", 6);
+    SHOW_STRING_PROP_MAJ(  machine, CPUProfile,                 "cpu-profile",          "CPUProfile:",      "host", 6);
 
     ChipsetType_T chipsetType;