Changeset 17092 in vbox

Timestamp:

Feb 24, 2009 7:57:52 PM (16 years ago)

Author:

vboxsync

Message:

RTGetOpt interface changes.

Location:

trunk

Files:

• include/iprt/getopt.h (modified) (1 diff)
• src/VBox/Main/webservice/vboxweb.cpp (modified) (3 diffs)

trunk/include/iprt/getopt.h

@@ -176 +176 @@
  * Initialize the RTGetOpt state.
  *
- * @returns VINF_SUCCESS, or VERR_INVALID_PARAMETER if fFlags is invalid.
+ * The passed in argument vector may be sorted if fFlags indicates that this is
+ * desired (to be implemented).
+ *
+ * @returns VINF_SUCCESS, VERR_INVALID_PARAMETER or VERR_INVALID_POINTER.
  * @param   pState      The state.
  *

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -131 +131 @@
  ****************************************************************************/
 
-static const RTOPTIONDEF g_aOptions[]
+static const RTGETOPTDEF g_aOptions[]
     = {
         { "--help",             'h', RTGETOPT_REQ_NOTHING },
@@ -255 +255 @@
     int c;
     int i = 1;
-    RTOPTIONUNION ValueUnion;
-    while ((c = RTGetOpt(argc, argv, g_aOptions, RT_ELEMENTS(g_aOptions), &i, &ValueUnion)))
+    RTGETOPTUNION ValueUnion;
+    RTGETOPTSTATE GetState;
+    RTGetOptInit(&GetState, argc, argv, g_aOptions, RT_ELEMENTS(g_aOptions), 1, 0 /* fFlags */);
+    while ((c = RTGetOpt(&GetState, &ValueUnion)))
     {
         switch (c)
@@ -324 +326 @@
             break;
 #endif
-        }
-    }
-    if (i != argc)
-    {
-        RTStrmPrintf(g_pStdErr, "Unknown option %s\n", argv[i]);
-        exit(1);
+            case VINF_GETOPT_NOT_OPTION:
+                RTStrmPrintf(g_pStdErr, "Unknown option %s\n", argv[i]);
+            return 1;
+        }
     }