Changeset 94213 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Mar 13, 2022 8:57:16 PM (3 years ago)

Author:

vboxsync

Message:

doc/manual,FE/VBoxManage: Convert usbdevsource command to refentry documentation, ​bugref:9186

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.cpp (modified) (1 diff)
• VBoxManage.h (modified) (1 diff)
• VBoxManageHelp.cpp (modified) (1 diff)
• VBoxManageUSB.cpp (modified) (3 diffs)

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

@@ -256 +256 @@
     { "convertfromraw",     USAGE_S_NEWCMD,HELP_CMD_CONVERTFROMRAW, handleConvertFromRaw,       VBMG_CMD_F_NO_COM },
     { "convertdd",          USAGE_S_NEWCMD,HELP_CMD_CONVERTFROMRAW, handleConvertFromRaw,       VBMG_CMD_F_NO_COM },
-    { "usbdevsource",       USAGE_USBDEVSOURCE,     VBMG_CMD_TODO, handleUSBDevSource,         0 },
+    { "usbdevsource",       USAGE_S_NEWCMD,  HELP_CMD_USBDEVSOURCE, handleUSBDevSource,         0 },
     { "cloudprofile",       USAGE_S_NEWCMD,      HELP_CMD_CLOUDPROFILE, handleCloudProfile,         0 },
     { "cloud",              USAGE_S_NEWCMD,         HELP_CMD_CLOUD, handleCloud,               0 },

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

@@ -118 +118 @@
     USAGE_I_GUESTSTATS,
     USAGE_I_REPAIRHD,
-    USAGE_USBDEVSOURCE,
     /* 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/VBoxManageHelp.cpp

@@ -641 +641 @@
                      "\n", SEP);
 
-    if (enmCommand == USAGE_USBDEVSOURCE || enmCommand == USAGE_S_ALL)
-    {
-        RTStrmPrintf(pStrm,
-                           "%s usbdevsource %s    add <source name>\n"
-                     "                            --backend <backend>\n"
-                     "                            --address <address>\n"
-                           "%s usbdevsource %s    remove <source name>\n"
-                     "\n", SEP, SEP);
-    }
-
 #ifndef VBOX_ONLY_DOCS /* Converted to man page, not needed. */
     if (enmCommand == USAGE_S_ALL)

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

@@ -569 +569 @@
     /* at least: 0: command, 1: source id */
     if (a->argc < 2)
-        return errorSyntax(USAGE_USBDEVSOURCE, Usb::tr("Not enough parameters"));
+        return errorSyntax(Usb::tr("Not enough parameters"));
 
     ComPtr<IHost> host;
     if (!strcmp(a->argv[0], "add"))
     {
+        setCurrentSubcommand(HELP_SCOPE_USBDEVSOURCE_ADD);
+
         Bstr strBackend;
         Bstr strAddress;
         if (a->argc != 6)
-            return errorSyntax(USAGE_USBDEVSOURCE, Usb::tr("Invalid number of parameters"));
+            return errorSyntax(Usb::tr("Invalid number of parameters"));
 
         for (int i = 2; i < a->argc; i++)
@@ -592 +594 @@
             }
             else
-                return errorSyntax(USAGE_USBDEVSOURCE, Usb::tr("Parameter \"%s\" is invalid"), a->argv[i]);
+                return errorSyntax(Usb::tr("Parameter \"%s\" is invalid"), a->argv[i]);
         }
 
@@ -605 +607 @@
     else if (!strcmp(a->argv[0], "remove"))
     {
+        setCurrentSubcommand(HELP_SCOPE_USBDEVSOURCE_REMOVE);
         CHECK_ERROR_RET(a->virtualBox, COMGETTER(Host)(host.asOutParam()), RTEXITCODE_FAILURE);
         CHECK_ERROR_RET(host, RemoveUSBDeviceSource(Bstr(a->argv[1]).raw()), RTEXITCODE_FAILURE);