Changeset 92535 in vbox

Timestamp:

Nov 21, 2021 8:59:41 PM (3 years ago)

Author:

vboxsync

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

148410

Message:

VBoxManage/showvminfo: Tighten up empty lists a little.

File:

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

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

@@ -414 +414 @@
     }
     if (details != VMINFO_MACHINEREADABLE)
-        RTPrintf(bwGroups.size() != 0 ? "\n" : Info::tr("<none>\n\n"));
+        RTPrintf(bwGroups.size() != 0 ? "\n" : Info::tr("<none>\n"));
 
     return rc;
@@ -2326 +2326 @@
         if (SUCCEEDED(rc))
         {
-            if (details != VMINFO_MACHINEREADABLE)
-                RTPrintf(Info::tr("\nUSB Device Filters:\n\n"));
-
-            if (Coll.size() == 0)
+            if (Coll.size() > 0)
             {
                 if (details != VMINFO_MACHINEREADABLE)
-                    RTPrintf(Info::tr("<none>\n\n"));
-            }
-            else
-            {
+                    RTPrintf(Info::tr("USB Device Filters:\n"));
                 for (size_t index = 0; index < Coll.size(); ++index)
                 {
@@ -2361 +2355 @@
                 }
             }
+            else if (details != VMINFO_MACHINEREADABLE)
+                RTPrintf("%-28s %s\n", Info::tr("USB Device Filters:"), Info::tr("<none>"));
         }
 
@@ -2501 +2497 @@
      */
     if (details != VMINFO_MACHINEREADABLE)
-        RTPrintf(Info::tr("Bandwidth groups:  "));
+        RTPrintf("%-28s ", Info::tr("Bandwidth groups:"));
     {
         ComPtr<IBandwidthControl> bwCtrl;
@@ -2514 +2510 @@
      */
     if (details != VMINFO_MACHINEREADABLE)
-        RTPrintf(Info::tr("Shared folders:"));
+        RTPrintf("%-28s ", Info::tr("Shared folders:"));
     uint32_t numSharedFolders = 0;
 #if 0 // not yet implemented
@@ -2552 +2548 @@
         }
     }
-    if (!numSharedFolders && details != VMINFO_MACHINEREADABLE)
-        RTPrintf(Info::tr("<none>\n"));
     if (details != VMINFO_MACHINEREADABLE)
-        RTPrintf("\n");
+    {
+        if (!numSharedFolders)
+            RTPrintf(Info::tr("<none>\n"));
+        else
+            RTPrintf("\n");
+    }
 
     if (pConsole)