Index: /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp	(revision 42497)
+++ /trunk/src/VBox/Additions/common/VBoxService/VBoxServiceToolBox.cpp	(revision 42498)
@@ -48,4 +48,11 @@
 *******************************************************************************/
 
+/** Generic option indices for commands. */
+enum
+{
+    VBOXSERVICETOOLBOXOPT_MACHINE_READABLE = 1000,
+    VBOXSERVICETOOLBOXOPT_VERBOSE
+};
+
 /** Options indices for "vbox_cat". */
 typedef enum VBOXSERVICETOOLBOXCATOPT
@@ -53,18 +60,4 @@
     VBOXSERVICETOOLBOXCATOPT_NO_CONTENT_INDEXED = 1000
 } VBOXSERVICETOOLBOXCATOPT;
-
-/** Options indices for "vbox_ls". */
-typedef enum VBOXSERVICETOOLBOXLSOPT
-{
-    VBOXSERVICETOOLBOXLSOPT_MACHINE_READABLE = 1000,
-    VBOXSERVICETOOLBOXLSOPT_VERBOSE
-} VBOXSERVICETOOLBOXLSOPT;
-
-/** Options indices for "vbox_stat". */
-typedef enum VBOXSERVICETOOLBOXSTATOPT
-{
-    VBOXSERVICETOOLBOXSTATOPT_MACHINE_READABLE = 1000
-} VBOXSERVICETOOLBOXSTATOPT;
-
 
 /** Flags for "vbox_ls". */
@@ -758,9 +751,9 @@
     static const RTGETOPTDEF s_aOptions[] =
     {
-        { "--machinereadable", VBOXSERVICETOOLBOXLSOPT_MACHINE_READABLE,      RTGETOPT_REQ_NOTHING },
+        { "--machinereadable", VBOXSERVICETOOLBOXOPT_MACHINE_READABLE,      RTGETOPT_REQ_NOTHING },
         { "--dereference",     'L',                                           RTGETOPT_REQ_NOTHING },
         { NULL,                'l',                                           RTGETOPT_REQ_NOTHING },
         { NULL,                'R',                                           RTGETOPT_REQ_NOTHING },
-        { "--verbose",         VBOXSERVICETOOLBOXLSOPT_VERBOSE,               RTGETOPT_REQ_NOTHING}
+        { "--verbose",         VBOXSERVICETOOLBOXOPT_VERBOSE,               RTGETOPT_REQ_NOTHING}
     };
 
@@ -799,5 +792,5 @@
                 break;
 
-            case VBOXSERVICETOOLBOXLSOPT_MACHINE_READABLE:
+            case VBOXSERVICETOOLBOXOPT_MACHINE_READABLE:
                 fOutputFlags |= VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE;
                 break;
@@ -807,5 +800,5 @@
                 break;
 
-            case VBOXSERVICETOOLBOXLSOPT_VERBOSE:
+            case VBOXSERVICETOOLBOXOPT_VERBOSE:
                 fVerbose = true;
                 break;
@@ -1024,5 +1017,5 @@
         { "--file-system",     'f',                                          RTGETOPT_REQ_NOTHING },
         { "--dereference",     'L',                                          RTGETOPT_REQ_NOTHING },
-        { "--machinereadable", VBOXSERVICETOOLBOXLSOPT_MACHINE_READABLE,     RTGETOPT_REQ_NOTHING },
+        { "--machinereadable", VBOXSERVICETOOLBOXOPT_MACHINE_READABLE,     RTGETOPT_REQ_NOTHING },
         { "--terse",           't',                                          RTGETOPT_REQ_NOTHING },
         { "--verbose",         'v',                                          RTGETOPT_REQ_NOTHING }
@@ -1056,5 +1049,5 @@
                 break;
 
-            case VBOXSERVICETOOLBOXLSOPT_MACHINE_READABLE:
+            case VBOXSERVICETOOLBOXOPT_MACHINE_READABLE:
                 fOutputFlags |= VBOXSERVICETOOLBOXOUTPUTFLAG_PARSEABLE;
                 break;