Changeset 93704 in vbox for trunk/src/VBox

Timestamp:

Feb 11, 2022 7:06:56 PM (3 years ago)

Author:

vboxsync

Message:

VBoxManage: Finish cleanup for 'modifyvm'.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.h (modified) (2 diffs)
• VBoxManageModifyVM.cpp (modified) (14 diffs)

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

@@ -101 +101 @@
     USAGE_UNREGISTERVM,
     USAGE_CREATEVM,
-    USAGE_MODIFYVM,
     USAGE_STARTVM,
     USAGE_CONTROLVM,
@@ -274 +273 @@
 #ifndef VBOX_ONLY_DOCS
 void parseGroups(const char *pcszGroups, com::SafeArray<BSTR> *pGroups);
+# ifdef VBOX_WITH_RECORDING
+int parseScreens(const char *pcszScreens, com::SafeArray<BOOL> *pScreens);
+# endif
 #endif
 RTEXITCODE handleModifyVM(HandlerArg *a);

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

@@ -531 +531 @@
 
 #ifdef VBOX_WITH_RECORDING
-static int parseScreens(const char *pcszScreens, com::SafeArray<BOOL> *pScreens)
+int parseScreens(const char *pcszScreens, com::SafeArray<BOOL> *pScreens)
 {
+    if (!RTStrICmp(pcszScreens, "all"))
+    {
+        for (uint32_t i = 0; i < pScreens->size(); i++)
+            (*pScreens)[i] = TRUE;
+        return VINF_SUCCESS;
+    }
+    if (!RTStrICmp(pcszScreens, "none"))
+    {
+        for (uint32_t i = 0; i < pScreens->size(); i++)
+            (*pScreens)[i] = FALSE;
+        return VINF_SUCCESS;
+    }
     while (pcszScreens && *pcszScreens)
     {
@@ -539 +551 @@
         int rc = RTStrToUInt32Ex(pcszScreens, &pszNext, 0, &iScreen);
         if (RT_FAILURE(rc))
-            return 1;
+            return VERR_PARSE_ERROR;
         if (iScreen >= pScreens->size())
-            return 1;
+            return VERR_PARSE_ERROR;
         if (pszNext && *pszNext)
         {
             pszNext = RTStrStripL(pszNext);
             if (*pszNext != ',')
-                return 1;
+                return VERR_PARSE_ERROR;
             pszNext++;
         }
@@ -552 +564 @@
         pcszScreens = pszNext;
     }
-    return 0;
+    return VINF_SUCCESS;
 }
 #endif
@@ -590 +602 @@
      * individually. */
     if (a->argc < 2)
-        return errorSyntax(USAGE_MODIFYVM, ModifyVM::tr("Not enough parameters"));
+        return errorSyntax(ModifyVM::tr("Not enough parameters"));
 
     /* try to find the given sessionMachine */
@@ -824 +836 @@
                     int vrc = RTGetOptFetchValue(&GetOptState, &ValueUnion, RTGETOPT_REQ_UINT32 | RTGETOPT_FLAG_HEX);
                     if (RT_FAILURE(vrc))
-                        return errorSyntax(USAGE_MODIFYVM, ModifyVM::tr("Missing or Invalid argument to '%s'"),
+                        return errorSyntax(ModifyVM::tr("Missing or invalid argument to '%s'"),
                                            GetOptState.pDef->pszLong);
                     aValue[i] = ValueUnion.u32;
@@ -1941 +1953 @@
             if (*ch == 0)                                                                \
             {                                                                            \
-                return errorSyntax(USAGE_MODIFYVM,                                       \
-                                   ModifyVM::tr("Missing or Invalid argument to '%s'"),  \
-                                    GetOptState.pDef->pszLong);                          \
+                return errorSyntax(ModifyVM::tr("Missing or invalid argument to '%s'"),  \
+                                   GetOptState.pDef->pszLong);                           \
             }                                                                            \
             ch++;                                                                        \
@@ -2042 +2053 @@
                     vrc = RTGetOptFetchValue(&GetOptState, &ValueUnion, RTGETOPT_REQ_STRING);
                     if (RT_FAILURE(vrc))
-                        return errorSyntax(USAGE_MODIFYVM, ModifyVM::tr("Not enough parameters"));
+                        return errorSyntax(ModifyVM::tr("Not enough parameters"));
                     CHECK_ERROR(engine, RemoveRedirect(Bstr(ValueUnion.psz).raw()));
                 }
@@ -2334 +2345 @@
                     int vrc = RTGetOptFetchValue(&GetOptState, &ValueUnion, RTGETOPT_REQ_STRING);
                     if (RT_FAILURE(vrc))
-                        return errorSyntax(USAGE_MODIFYVM,
-                                           ModifyVM::tr("Missing or Invalid argument to '%s'"),
+                        return errorSyntax(ModifyVM::tr("Missing or invalid argument to '%s'"),
                                            GetOptState.pDef->pszLong);
 
@@ -2393 +2403 @@
                 }
                 else
-                    return errorSyntax(USAGE_MODIFYVM,
-                                       ModifyVM::tr("Invalid argument to '%s'"),
+                    return errorSyntax(ModifyVM::tr("Invalid argument to '%s'"),
                                        GetOptState.pDef->pszLong);
                 break;
@@ -2415 +2424 @@
                     int vrc = RTGetOptFetchValue(&GetOptState, &ValueUnion, RTGETOPT_REQ_UINT32) != MODIFYVM_UART;
                     if (RT_FAILURE(vrc))
-                        return errorSyntax(USAGE_MODIFYVM,
-                                           ModifyVM::tr("Missing or Invalid argument to '%s'"),
+                        return errorSyntax(ModifyVM::tr("Missing or invalid argument to '%s'"),
                                            GetOptState.pDef->pszLong);
 
@@ -2459 +2467 @@
                     int vrc = RTGetOptFetchValue(&GetOptState, &ValueUnion, RTGETOPT_REQ_UINT32) != MODIFYVM_LPT;
                     if (RT_FAILURE(vrc))
-                        return errorSyntax(USAGE_MODIFYVM,
-                                           ModifyVM::tr("Missing or Invalid argument to '%s'"),
+                        return errorSyntax(ModifyVM::tr("Missing or invalid argument to '%s'"),
                                            GetOptState.pDef->pszLong);
 
@@ -2896 +2903 @@
                 int vrc = RTGetOptFetchValue(&GetOptState, &ValueUnion, RTGETOPT_REQ_STRING);
                 if (RT_FAILURE(vrc))
-                    return errorSyntax(USAGE_MODIFYVM,
-                                       ModifyVM::tr("Missing or Invalid argument to '%s'"),
+                    return errorSyntax(ModifyVM::tr("Missing or invalid argument to '%s'"),
                                        GetOptState.pDef->pszLong);
                 const char *pszNewName = ValueUnion.psz;
@@ -3240 +3246 @@
                         CHECK_ERROR(pGraphicsAdapter, COMGETTER(MonitorCount)(&cMonitors));
                         com::SafeArray<BOOL> screens(cMonitors);
-                        if (parseScreens(ValueUnion.psz, &screens))
+                        if (RT_FAILURE(parseScreens(ValueUnion.psz, &screens)))
                         {
                             errorArgument(ModifyVM::tr("Invalid list of screens specified\n"));
@@ -3484 +3490 @@
 
             default:
-                errorGetOpt(USAGE_MODIFYVM, c, &ValueUnion);
+                errorGetOpt(c, &ValueUnion);
                 rc = E_FAIL;
                 break;