Changeset 24590 in vbox

Timestamp:

Nov 11, 2009 3:21:59 PM (15 years ago)

Author:

vboxsync

Message:

VBoxManageDisk.cpp: Wrong syntax diagram for convertfromraw if given an unknown switch.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageDisk.cpp (modified) (1 diff)
• VirtualBox/src/VBoxConsoleWnd.cpp (modified) (1 diff)

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

@@ -800 +800 @@
 
             default:
-                if (c > 0)
-                {
-                    if (RT_C_IS_PRINT(c))
-                        return errorSyntax(USAGE_CONVERTFROMRAW, "Invalid option -%c", c);
-                    else
-                        return errorSyntax(USAGE_CONVERTFROMRAW, "Invalid option case %i", c);
-                }
-                else if (c == VERR_GETOPT_UNKNOWN_OPTION)
-                    return errorSyntax(USAGE_CREATEHD, "unknown option: %s\n", ValueUnion.psz);
-                else if (ValueUnion.pDef)
-                    return errorSyntax(USAGE_CONVERTFROMRAW, "%s: %Rrs", ValueUnion.pDef->pszLong, c);
-                else
-                    return errorSyntax(USAGE_CONVERTFROMRAW, "error: %Rrs", c);
+                return errorGetOpt(USAGE_CONVERTFROMRAW, c, &ValueUnion);
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -348 +348 @@
         *aSelf = this;
 
+#ifndef DEBUG_bird /* this drives me nuts! */
     /* Cache IMedium data! */
     vboxGlobal().startEnumeratingMedia();
+#endif
 
 #if !(defined (Q_WS_WIN) || defined (Q_WS_MAC))