Changeset 17091 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Feb 24, 2009 7:55:23 PM (16 years ago)

Author:

vboxsync

Message:

RTGetOpt interface changes.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• testcase/tstGIP-2.cpp (modified) (4 diffs)
• win/SUPSvc-win.cpp (modified) (5 diffs)

trunk/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp

@@ -53 +53 @@
      * Parse args
      */
-    static const RTOPTIONDEF g_aOptions[] =
+    static const RTGETOPTDEF g_aOptions[] =
     {
         { "--interations",      'i', RTGETOPT_REQ_INT32 },
@@ -65 +65 @@
     bool fSpin = false;
     int ch;
-    int iArg = 1;
-    RTOPTIONUNION ValueUnion;
-    while ((ch = RTGetOpt(argc, argv, g_aOptions, RT_ELEMENTS(g_aOptions), &iArg, &ValueUnion)))
+    RTGETOPTUNION ValueUnion;
+    RTGETOPTSTATE GetState;
+    RTGetOptInit(&GetState, argc, argv, g_aOptions, RT_ELEMENTS(g_aOptions), 1, 0 /* fFlags */);
+    while ((ch = RTGetOpt(&GetState, &ValueUnion)))
     {
         switch (ch)
@@ -87 +88 @@
                 break;
 
+            case VINF_GETOPT_NOT_OPTION:
+                RTPrintf("tstGIP-2: syntax error: %s\n", ValueUnion.psz);
+                return 1;
+
             default:
                 if (ch < 0)
@@ -94 +99 @@
                 return 1;
         }
-    }
-    if (iArg < argc)
-    {
-        RTPrintf("tstGIP-2: syntax error: %s\n", ValueUnion.psz);
-        return 1;
     }
 

trunk/src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp

@@ -263 +263 @@
      */
     bool fVerbose = false;
-    static const RTOPTIONDEF s_aOptions[] =
+    static const RTGETOPTDEF s_aOptions[] =
     {
         { "--verbose", 'v', RTGETOPT_REQ_NOTHING }
     };
-    int iArg = 0;
     int ch;
-    RTOPTIONUNION Value;
-    while ((ch = RTGetOpt(argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), &iArg, &Value)))
+    RTGETOPTUNION Value;
+    RTGETOPTSTATE GetState;
+    RTGetOptInit(&GetState, argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), 0, 0 /* fFlags*/);
+    while ((ch = RTGetOpt(&GetState, &Value)))
         switch (ch)
         {
-            case 'v':   fVerbose = true;  break;
-            default:    return supSvcDisplayGetOptError("delete", ch, argc, argv, iArg, &Value);
-        }
-    if (iArg != argc)
-        return supSvcDisplayTooManyArgsError("delete", argc, argv, iArg);
+            case 'v':
+                fVerbose = true;
+                break;
+            case VINF_GETOPT_NOT_OPTION:
+                return supSvcDisplayTooManyArgsError("delete", argc, argv, iArg);
+            default:
+                return supSvcDisplayGetOptError("delete", ch, argc, argv, iArg, &Value);
+        }
 
     /*
@@ -328 +332 @@
     int iArg = 0;
     int ch;
-    RTOPTIONUNION Value;
+    RTGETOPTUNION Value;
     while ((ch = RTGetOpt(argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), &iArg, &Value)))
         switch (ch)
@@ -548 +552 @@
             int ch;
             int rc = 0;
-            RTOPTIONUNION Value;
+            RTGETOPTUNION Value;
             while (   !rc
                    && (ch = RTGetOpt(cArgs, papszArgs, s_aOptions, RT_ELEMENTS(s_aOptions), &iArg, &Value)))
@@ -646 +650 @@
     int iArg = 0;
     int ch;
-    RTOPTIONUNION Value;
+    RTGETOPTUNION Value;
     while ((ch = RTGetOpt(argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), &iArg, &Value)))
         switch (ch)
@@ -701 +705 @@
     int iArg = 0;
     int ch;
-    RTOPTIONUNION Value;
+    RTGETOPTUNION Value;
     while ((ch = RTGetOpt(argc, argv, s_aOptions, RT_ELEMENTS(s_aOptions), &iArg, &Value)))
         switch (ch)