Changeset 83799 in vbox for trunk

Timestamp:

Apr 18, 2020 2:16:46 PM (5 years ago)

Author:

vboxsync

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

137325

Message:

VBoxAutostart: VC++ 14.1 adjustments. Removed some unnecessary stdc++ headers and eliminated one silly std::string usage. [adjustments] bugref:8489

File:

• trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-posix.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-posix.cpp

@@ -276 +276 @@
     for (unsigned i = 0; i < RT_ELEMENTS(g_aOptions); i++)
     {
-        char szOptions[128];
-        const char *pszOptions = g_aOptions[i].pszLong;
-        if (g_aOptions[i].iShort < 1000) /* Don't show short options which are defined by an ID! */
-        {
-            RTStrPrintf(szOptions, sizeof(szOptions), "%s, -%c", g_aOptions[i].pszLong, g_aOptions[i].iShort);
-            pszOptions = szOptions;
-        }
-
-        const char *pcszDescr = "";
+        const char *pcszDescr;
         switch (g_aOptions[i].iShort)
         {
@@ -316 +308 @@
                 pcszDescr = "Name of the configuration file for the global overrides.";
                 break;
-        }
-
-        RTStrmPrintf(g_pStdErr, "%-23s%s\n", pszOptions, pcszDescr);
-    }
-
-    RTStrmPrintf(g_pStdErr, "\nUse environment variable VBOXAUTOSTART_RELEASE_LOG for logging options.\n");
+            default:
+                AssertFailedBreakStmt(pcszDescr = "");
+        }
+
+        if (g_aOptions[i].iShort < 1000)
+            RTStrmPrintf(g_pStdErr,
+                         "  %s, -%c\n"
+                         "      %s\n", g_aOptions[i].pszLong, g_aOptions[i].iShort, pcszDescr);
+        else
+            RTStrmPrintf(g_pStdErr,
+                         "  %s\n"
+                         "      %s\n", g_aOptions[i].pszLong, pcszDescr);
+    }
+
+    RTStrmPrintf(g_pStdErr,
+                 "\n"
+                 "Use environment variable VBOXAUTOSTART_RELEASE_LOG for logging options.\n");
 }