Changeset 93706 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 11, 2022 7:14:49 PM (3 years ago)

Author:

vboxsync

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

149877

Message:

VBoxManage: Finish cleanup for 'registervm', 'unregistervm', 'createvm', 'movevm' and 'cloudprofile'.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.h (modified) (3 diffs)
• VBoxManageMisc.cpp (modified) (14 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -98 +98 @@
 {
     USAGE_INVALID = 0,
-    USAGE_REGISTERVM,
-    USAGE_UNREGISTERVM,
-    USAGE_CREATEVM,
     USAGE_STARTVM,
     USAGE_CONTROLVM,
@@ -109 +106 @@
     USAGE_MODIFYMEDIUM,
     USAGE_CLONEMEDIUM,
-    USAGE_MOVEVM,
     USAGE_CREATEHOSTIF,
     USAGE_REMOVEHOSTIF,
@@ -150 +146 @@
     USAGE_MEDIUMENCCHKPWD,
     USAGE_USBDEVSOURCE,
-    USAGE_CLOUDPROFILE,
     /* Insert new entries before this line, but only if it is not an option
      * to go for the new style command and help handling (see e.g. extpack,

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

@@ -66 +66 @@
 
     if (a->argc != 1)
-        return errorSyntax(USAGE_REGISTERVM, Misc::tr("Incorrect number of parameters"));
+        return errorSyntax(Misc::tr("Incorrect number of parameters"));
 
     ComPtr<IMachine> machine;
@@ -125 +125 @@
                     VMName = ValueUnion.psz;
                 else
-                    return errorSyntax(USAGE_UNREGISTERVM, Misc::tr("Invalid parameter '%s'"), ValueUnion.psz);
+                    return errorSyntax(Misc::tr("Invalid parameter '%s'"), ValueUnion.psz);
                 break;
 
@@ -132 +132 @@
                 {
                     if (RT_C_IS_PRINT(c))
-                        return errorSyntax(USAGE_UNREGISTERVM, Misc::tr("Invalid option -%c"), c);
-                    return errorSyntax(USAGE_UNREGISTERVM, Misc::tr("Invalid option case %i"), c);
+                        return errorSyntax(Misc::tr("Invalid option -%c"), c);
+                    return errorSyntax(Misc::tr("Invalid option case %i"), c);
                 }
                 if (c == VERR_GETOPT_UNKNOWN_OPTION)
-                    return errorSyntax(USAGE_UNREGISTERVM, Misc::tr("unknown option: %s\n"), ValueUnion.psz);
+                    return errorSyntax(Misc::tr("unknown option: %s\n"), ValueUnion.psz);
                 if (ValueUnion.pDef)
-                    return errorSyntax(USAGE_UNREGISTERVM, "%s: %Rrs", ValueUnion.pDef->pszLong, c);
-                return errorSyntax(USAGE_UNREGISTERVM, Misc::tr("error: %Rrs"), c);
+                    return errorSyntax("%s: %Rrs", ValueUnion.pDef->pszLong, c);
+                return errorSyntax(Misc::tr("error: %Rrs"), c);
         }
     }
@@ -145 +145 @@
     /* check for required options */
     if (!VMName)
-        return errorSyntax(USAGE_UNREGISTERVM, Misc::tr("VM name required"));
+        return errorSyntax(Misc::tr("VM name required"));
 
     ComPtr<IMachine> machine;
@@ -250 +250 @@
 
             default:
-                return errorGetOpt(USAGE_CREATEVM, c, &ValueUnion);
+                return errorGetOpt(c, &ValueUnion);
         }
     }
@@ -256 +256 @@
     /* check for required options */
     if (bstrName.isEmpty())
-        return errorSyntax(USAGE_CREATEVM, Misc::tr("Parameter --name is required"));
+        return errorSyntax(Misc::tr("Parameter --name is required"));
 
     do
@@ -354 +354 @@
                     pszSrcName = ValueUnion.psz;
                 else
-                    return errorSyntax(USAGE_MOVEVM, Misc::tr("Invalid parameter '%s'"), ValueUnion.psz);
+                    return errorSyntax(Misc::tr("Invalid parameter '%s'"), ValueUnion.psz);
                 break;
 
             default:
-                return errorGetOpt(USAGE_MOVEVM, c, &ValueUnion);
+                return errorGetOpt(c, &ValueUnion);
         }
     }
@@ -370 +370 @@
     /* Check for required options */
     if (!pszSrcName)
-        return errorSyntax(USAGE_MOVEVM, Misc::tr("VM name required"));
+        return errorSyntax(Misc::tr("VM name required"));
 
     /* Get the machine object */
@@ -2132 +2132 @@
                 break;
             default:
-                return errorGetOpt(USAGE_CLOUDPROFILE, c, &ValueUnion);
+                return errorGetOpt(c, &ValueUnion);
         }
     }
@@ -2138 +2138 @@
     /* check for required options */
     if (bstrProvider.isEmpty())
-        return errorSyntax(USAGE_CLOUDPROFILE, Misc::tr("Parameter --provider is required"));
+        return errorSyntax(Misc::tr("Parameter --provider is required"));
     if (bstrProfile.isEmpty())
-        return errorSyntax(USAGE_CLOUDPROFILE, Misc::tr("Parameter --profile is required"));
+        return errorSyntax(Misc::tr("Parameter --profile is required"));
 
     ComPtr<IVirtualBox> pVirtualBox = a->virtualBox;
@@ -2188 +2188 @@
     /* check for required options */
     if (bstrProvider.isEmpty())
-        return errorSyntax(USAGE_CLOUDPROFILE, Misc::tr("Parameter --provider is required"));
+        return errorSyntax(Misc::tr("Parameter --provider is required"));
     if (bstrProfile.isEmpty())
-        return errorSyntax(USAGE_CLOUDPROFILE, Misc::tr("Parameter --profile is required"));
+        return errorSyntax(Misc::tr("Parameter --profile is required"));
 
     ComPtr<IVirtualBox> pVirtualBox = a->virtualBox;
@@ -2248 +2248 @@
     /* check for required options */
     if (bstrProvider.isEmpty())
-        return errorSyntax(USAGE_CLOUDPROFILE, Misc::tr("Parameter --provider is required"));
+        return errorSyntax(Misc::tr("Parameter --provider is required"));
     if (bstrProfile.isEmpty())
-        return errorSyntax(USAGE_CLOUDPROFILE, Misc::tr("Parameter --profile is required"));
+        return errorSyntax(Misc::tr("Parameter --profile is required"));
 
     /*
@@ -2308 +2308 @@
                 break;
             default:
-                return errorGetOpt(USAGE_CLOUDPROFILE, c, &ValueUnion);
+                return errorGetOpt(c, &ValueUnion);
         }
     }
@@ -2346 +2346 @@
     /* check for required options */
     if (bstrProvider.isEmpty())
-        return errorSyntax(USAGE_CLOUDPROFILE, Misc::tr("Parameter --provider is required"));
+        return errorSyntax(Misc::tr("Parameter --provider is required"));
     if (bstrProfile.isEmpty())
-        return errorSyntax(USAGE_CLOUDPROFILE, Misc::tr("Parameter --profile is required"));
+        return errorSyntax(Misc::tr("Parameter --profile is required"));
 
     ComPtr<IVirtualBox> pVirtualBox = a->virtualBox;