Changeset 24901 in vbox for trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

Timestamp:

Nov 24, 2009 1:57:53 PM (15 years ago)

Author:

vboxsync

Message:

VBoxManage: A little clean up in progress.

File:

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

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

@@ -64 +64 @@
 #ifndef VBOX_ONLY_DOCS
 using namespace com;
-
-/** command handler type */
-typedef int (*PFNHANDLER)(HandlerArg *a);
-
 #endif /* !VBOX_ONLY_DOCS */
 
-////////////////////////////////////////////////////////////////////////////////
-//
-// global variables
-//
-////////////////////////////////////////////////////////////////////////////////
-
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
 /*extern*/ bool g_fDetailedProgress = false;
 
@@ -176 +169 @@
     return iRc;
 }
-#endif /* !VBOX_ONLY_DOCS */
-
-void showLogo(void)
-{
-    static bool fShown; /* show only once */
-
-    if (!fShown)
-    {
-        RTPrintf("VirtualBox Command Line Management Interface Version "
-                 VBOX_VERSION_STRING  "\n"
-                 "(C) 2005-2009 Sun Microsystems, Inc.\n"
-                 "All rights reserved.\n"
-                 "\n");
-        fShown = true;
-    }
-}
-
-#ifndef VBOX_ONLY_DOCS
 
 static int handleRegisterVM(HandlerArg *a)
@@ -1889 +1864 @@
             return 0;
         }
-        else if (   !strcmp(argv[i], "-v")
-                 || !strcmp(argv[i], "-version")
-                 || !strcmp(argv[i], "-Version")
-                 || !strcmp(argv[i], "--version"))
+
+        if (   !strcmp(argv[i], "-v")
+            || !strcmp(argv[i], "-version")
+            || !strcmp(argv[i], "-Version")
+            || !strcmp(argv[i], "--version"))
         {
             /* Print version number, and do nothing else. */
@@ -1898 +1874 @@
             return 0;
         }
-        else if (   !strcmp(argv[i], "--dumpopts")
-                 || !strcmp(argv[i], "-dumpopts"))
+
+        if (   !strcmp(argv[i], "--dumpopts")
+            || !strcmp(argv[i], "-dumpopts"))
         {
             /* Special option to dump really all commands,
@@ -1906 +1883 @@
             return 0;
         }
-        else if (   !strcmp(argv[i], "--nologo")
-                 || !strcmp(argv[i], "-nologo")
-                 || !strcmp(argv[i], "-q"))
+
+        if (   !strcmp(argv[i], "--nologo")
+            || !strcmp(argv[i], "-nologo")
+            || !strcmp(argv[i], "-q"))
         {
             /* suppress the logo */
@@ -1994 +1972 @@
      * All registered command handlers
      */
-    struct
+    static const struct
     {
         const char *command;
-        PFNHANDLER handler;
-    } commandHandlers[] =
+        int (*handler)(HandlerArg *a);
+    } s_commandHandlers[] =
     {
         { "internalcommands", handleInternalCommands },
@@ -2035 +2013 @@
 #ifdef VBOX_WITH_GUEST_PROPS
         { "guestproperty",    handleGuestProperty },
-#endif /* VBOX_WITH_GUEST_PROPS defined */
+#endif
         { "metrics",          handleMetrics },
         { "import",           handleImportAppliance },
         { "export",           handleExportAppliance },
-#if defined(VBOX_WITH_NETFLT)
+#ifdef VBOX_WITH_NETFLT
         { "hostonlyif",       handleHostonlyIf },
 #endif
@@ -2047 +2025 @@
 
     int commandIndex;
-    for (commandIndex = 0; commandHandlers[commandIndex].command != NULL; commandIndex++)
-    {
-        if (!strcmp(commandHandlers[commandIndex].command, argv[iCmd]))
+    for (commandIndex = 0; s_commandHandlers[commandIndex].command != NULL; commandIndex++)
+    {
+        if (!strcmp(s_commandHandlers[commandIndex].command, argv[iCmd]))
         {
             handlerArg.argc = argc - iCmdArg;
             handlerArg.argv = &argv[iCmdArg];
 
-            rc = commandHandlers[commandIndex].handler(&handlerArg);
+            rc = s_commandHandlers[commandIndex].handler(&handlerArg);
             break;
         }
     }
-    if (!commandHandlers[commandIndex].command)
+    if (!s_commandHandlers[commandIndex].command)
     {
         rc = errorSyntax(USAGE_ALL, "Invalid command '%s'", Utf8Str(argv[iCmd]).raw());